diff --git a/src/Forms/ApplicationBase.cs b/src/Forms/ApplicationBase.cs
index 91ed97188..bacc54799 100644
--- a/src/Forms/ApplicationBase.cs
+++ b/src/Forms/ApplicationBase.cs
@@ -8,6 +8,9 @@
 using Splat.DryIoc;
 using Xamarin.Forms;
 
+[assembly: XmlnsPrefix("https://schemas.rocketsurgeonsguild.com/xaml/airframe/forms", "airframe")]
+[assembly: XmlnsDefinition("https://schemas.rocketsurgeonsguild.com/xaml/airframe/forms", "Rocket.Surgery.Airframe.Forms")]
+
 namespace Rocket.Surgery.Airframe.Forms
 {
     /// <summary>
diff --git a/src/Popup/PopupPageBase.cs b/src/Popup/PopupPageBase.cs
index fa020a4b5..efc749ef6 100644
--- a/src/Popup/PopupPageBase.cs
+++ b/src/Popup/PopupPageBase.cs
@@ -7,6 +7,10 @@
 using ReactiveUI;
 using ReactiveUI.XamForms;
 using RxUI.Plugins.Popup;
+using Xamarin.Forms;
+
+[assembly: XmlnsPrefix("https://schemas.rocketsurgeonsguild.com/xaml/airframe/popup", "popup")]
+[assembly: XmlnsDefinition("https://schemas.rocketsurgeonsguild.com/xaml/airframe/popup", "Rocket.Surgery.Airframe.Popup")]
 
 namespace Rocket.Surgery.Airframe.Popup
 {
diff --git a/src/ViewModels/IViewModel.cs b/src/ViewModels/IViewModel.cs
index 81cf34484..e72017549 100644
--- a/src/ViewModels/IViewModel.cs
+++ b/src/ViewModels/IViewModel.cs
@@ -1,6 +1,10 @@
 using ReactiveUI;
+using Xamarin.Forms;
 
-namespace Rocket.Surgery.Airframe
+[assembly: XmlnsPrefix("https://schemas.rocketsurgeonsguild.com/xaml/airframe/viewmodels", "viewmodels")]
+[assembly: XmlnsDefinition("https://schemas.rocketsurgeonsguild.com/xaml/airframe/viewmodels", "Rocket.Surgery.Airframe.ViewModels")]
+
+namespace Rocket.Surgery.Airframe.ViewModels
 {
     /// <summary>
     /// Interface representation of a base ReactiveUI View Model.
diff --git a/src/ViewModels/ViewModelBase.cs b/src/ViewModels/ViewModelBase.cs
index 340b7854d..a66a60c57 100644
--- a/src/ViewModels/ViewModelBase.cs
+++ b/src/ViewModels/ViewModelBase.cs
@@ -1,7 +1,7 @@
 using System.Reactive.Disposables;
 using ReactiveUI;
 
-namespace Rocket.Surgery.Airframe
+namespace Rocket.Surgery.Airframe.ViewModels
 {
 #pragma warning disable CA2214 // Do not call overridable methods in constructors
     /// <summary>
diff --git a/test/ViewModel.Tests/Test.cs b/test/ViewModel.Tests/Test.cs
index 0fcfc3033..ddd4b9afa 100644
--- a/test/ViewModel.Tests/Test.cs
+++ b/test/ViewModel.Tests/Test.cs
@@ -1,4 +1,5 @@
 using Rocket.Surgery.Airframe;
+using Rocket.Surgery.Airframe.ViewModels;
 
 namespace Rocket.Surgery.Airframe.ViewModel.Tests
 {