diff --git a/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs
index bda6b23..06f3ccd 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using Archetype.Umbraco.PropertyConverters;
+using Archetype.PropertyConverters;
 using Newtonsoft.Json;
 using NUnit.Framework;
 
@@ -38,7 +38,7 @@ namespace Archetype.Tests.Serialization
         {
             var converter = new ArchetypeValueConverter();
             var json = JsonConvert.SerializeObject(_pageDetails, Formatting.Indented);
-            var archetype = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, json, false);
+            var archetype = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, json, false);
 
             Assert.NotNull(archetype);
         }
@@ -82,7 +82,7 @@ namespace Archetype.Tests.Serialization
         {
             var converter = new ArchetypeValueConverter();
             var json = JsonConvert.SerializeObject(_pages, Formatting.Indented);
-            var archetype = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, json, false);
+            var archetype = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, json, false);
 
             Assert.NotNull(archetype);
         }
diff --git a/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs
index f5ad6bb..23c7062 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs
@@ -1,5 +1,5 @@
 using System;
-using Archetype.Umbraco.PropertyConverters;
+using Archetype.PropertyConverters;
 using Newtonsoft.Json;
 using NUnit.Framework;
 
@@ -111,7 +111,7 @@ namespace Archetype.Tests.Serialization
 
             var converter = new ArchetypeValueConverter();
             var json = JsonConvert.SerializeObject(model);
-            var archetype = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, json, false);
+            var archetype = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, json, false);
 
             Assert.NotNull(archetype);
         }
@@ -121,7 +121,7 @@ namespace Archetype.Tests.Serialization
         {
             var converter = new ArchetypeValueConverter();
             var json = JsonConvert.SerializeObject(_annualStatement);
-            var archetype = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, json, false);
+            var archetype = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, json, false);
 
             Assert.NotNull(archetype);
         }
@@ -149,7 +149,7 @@ namespace Archetype.Tests.Serialization
 
             var converter = new ArchetypeValueConverter();
             var json = JsonConvert.SerializeObject(model, Formatting.Indented);
-            var archetype = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, json, false);
+            var archetype = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, json, false);
 
             Assert.NotNull(archetype);
         }
@@ -177,7 +177,7 @@ namespace Archetype.Tests.Serialization
 
             var converter = new ArchetypeValueConverter();
             var json = JsonConvert.SerializeObject(model, Formatting.Indented);
-            var archetype = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, json, false);
+            var archetype = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, json, false);
 
             Assert.NotNull(archetype);
         }
@@ -197,7 +197,7 @@ namespace Archetype.Tests.Serialization
 
             var converter = new ArchetypeValueConverter();
             var json = JsonConvert.SerializeObject(model, Formatting.Indented);
-            var archetype = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, json, false);
+            var archetype = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, json, false);
 
             Assert.NotNull(archetype);
         }
diff --git a/app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs b/app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs
index bb72c16..c9a5129 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Archetype.Umbraco.Serialization;
+using Archetype.Serialization;
 using Newtonsoft.Json;
 
 namespace Archetype.Tests.Serialization
diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
index 618b9aa..e31c89d 100644
--- a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
+++ b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
@@ -9,7 +9,7 @@ using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Archetype.Umbraco.Serialization
+namespace Archetype.Serialization
 {
     public class ArchetypeJsonConverter : JsonConverter
     {
diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/AsArchetypeAttribute.cs b/app/Umbraco/Umbraco.Archetype/Serialization/AsArchetypeAttribute.cs
index 800bb36..b450a20 100644
--- a/app/Umbraco/Umbraco.Archetype/Serialization/AsArchetypeAttribute.cs
+++ b/app/Umbraco/Umbraco.Archetype/Serialization/AsArchetypeAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Archetype.Umbraco.Serialization
+namespace Archetype.Serialization
 {
     public class AsArchetypeAttribute : Attribute
     {
diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/AsFieldsetAttribute.cs b/app/Umbraco/Umbraco.Archetype/Serialization/AsFieldsetAttribute.cs
index bcee649..60c4c08 100644
--- a/app/Umbraco/Umbraco.Archetype/Serialization/AsFieldsetAttribute.cs
+++ b/app/Umbraco/Umbraco.Archetype/Serialization/AsFieldsetAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Archetype.Umbraco.Serialization
+namespace Archetype.Serialization
 {
     public class AsFieldsetAttribute : Attribute
     {
diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/SerializationExtensions.cs b/app/Umbraco/Umbraco.Archetype/Serialization/SerializationExtensions.cs
index 8ae37d0..31bab75 100644
--- a/app/Umbraco/Umbraco.Archetype/Serialization/SerializationExtensions.cs
+++ b/app/Umbraco/Umbraco.Archetype/Serialization/SerializationExtensions.cs
@@ -7,7 +7,7 @@ using Newtonsoft.Json;
 using Umbraco.Core.Models;
 using Umbraco.Web;
 
-namespace Archetype.Umbraco.Serialization
+namespace Archetype.Serialization
 {
     public static class SerializationExtensions
     {