diff --git a/uSync.AutoTemplates/TemplateWatcher.cs b/uSync.AutoTemplates/TemplateWatcher.cs
index 1bfac2f4..8b355b9a 100644
--- a/uSync.AutoTemplates/TemplateWatcher.cs
+++ b/uSync.AutoTemplates/TemplateWatcher.cs
@@ -191,7 +191,7 @@ private void CheckFile(string filename)
 
                 if (template != null)
                 {
-                    var currentMaster = string.IsNullOrWhiteSpace(template.MasterTemplateAlias) ? "null" : template.MasterTemplateAlias;
+                    var currentMaster = string.IsNullOrWhiteSpace(template.LayoutTemplateAlias) ? "null" : template.LayoutTemplateAlias;
                     if (fileMasterAlias != currentMaster)
                     {
                         // template.SetMasterTemplate(GetMasterTemplate(fileMasterAlias));
diff --git a/uSync.BackOffice/SyncHandlers/Handlers/TemplateHandler.cs b/uSync.BackOffice/SyncHandlers/Handlers/TemplateHandler.cs
index 86a45463..27ac26d1 100644
--- a/uSync.BackOffice/SyncHandlers/Handlers/TemplateHandler.cs
+++ b/uSync.BackOffice/SyncHandlers/Handlers/TemplateHandler.cs
@@ -84,7 +84,7 @@ protected override async Task<IReadOnlyList<OrderedNodeInfo>> GetMergedItemsAsyn
 
                 // top level, lets check they aren't secretly lower down.
                 var templateContent = await GetTemplateContentAsync(item.Alias);
-                var masterAlias = _templateContentParserService.MasterTemplateAlias(templateContent);
+                var masterAlias = _templateContentParserService.LayoutTemplateAlias(templateContent);
                 if (string.IsNullOrWhiteSpace(masterAlias) || masterAlias == item.Alias || masterAlias.InvariantEquals("null"))
                 {
                     results.Add(item);
diff --git a/uSync.Core/Serialization/Serializers/TemplateSerializer.cs b/uSync.Core/Serialization/Serializers/TemplateSerializer.cs
index eee89a97..2c2fa522 100644
--- a/uSync.Core/Serialization/Serializers/TemplateSerializer.cs
+++ b/uSync.Core/Serialization/Serializers/TemplateSerializer.cs
@@ -306,7 +306,7 @@ protected override async Task<SyncAttempt<XElement>> SerializeCoreAsync(ITemplat
         var node = this.InitializeBaseNode(item, item.Alias, await this.CalculateLevelAsync(item));
 
         node.Add(new XElement("Name", item.Name));
-        node.Add(new XElement("Parent", item.MasterTemplateAlias));
+        node.Add(new XElement("Parent", item.LayoutTemplateAlias));
 
         if (options.GetSetting(uSyncConstants.Conventions.IncludeContent, false))
         {
@@ -322,14 +322,14 @@ private static XElement SerializeContent(ITemplate item)
 
     private async Task<int> CalculateLevelAsync(ITemplate item)
     {
-        if (item.MasterTemplateAlias.IsNullOrWhiteSpace()) return 1;
+        if (item.LayoutTemplateAlias.IsNullOrWhiteSpace()) return 1;
 
         int level = 1;
         var current = item;
-        while (!string.IsNullOrWhiteSpace(current.MasterTemplateAlias) && level < 20)
+        while (!string.IsNullOrWhiteSpace(current.LayoutTemplateAlias) && level < 20)
         {
             level++;
-            var parent = await FindItemAsync(current.MasterTemplateAlias);
+            var parent = await FindItemAsync(current.LayoutTemplateAlias);
             if (parent == null) return level;
 
             current = parent;