diff --git a/src/Extension/BetterNavigatorExtension.php b/src/Extension/BetterNavigatorExtension.php
index 5d8d83e..9658e89 100644
--- a/src/Extension/BetterNavigatorExtension.php
+++ b/src/Extension/BetterNavigatorExtension.php
@@ -157,7 +157,7 @@ class BetterNavigatorExtension extends DataExtension
         // Merge with page data, send to template and render
         $navigator = new ArrayData($bNData);
 
-        return $this->owner->customise($navigator)->renderWith('BetterNavigator\\BetterNavigator');
+        return $this->owner->customise($navigator)->renderWith('JonoM\\BetterNavigator\\BetterNavigator');
     }
 
     /**
diff --git a/templates/BetterNavigator/BetterNavigator.ss b/templates/JonoM/BetterNavigator/BetterNavigator.ss
similarity index 96%
rename from templates/BetterNavigator/BetterNavigator.ss
rename to templates/JonoM/BetterNavigator/BetterNavigator.ss
index 2d95dca..c7ce87c 100644
--- a/templates/BetterNavigator/BetterNavigator.ss
+++ b/templates/JonoM/BetterNavigator/BetterNavigator.ss
@@ -39,7 +39,7 @@
 
         </div>
 
-        <% include BetterNavigator\BetterNavigatorExtraContent %>
+        <% include JonoM\BetterNavigator\BetterNavigatorExtraContent %>
 
         <% if $Mode == 'dev' || $IsDeveloper %>
 
@@ -73,7 +73,7 @@
 
             </div>
 
-            <% include BetterNavigator\BetterNavigatorExtraDevTools %>
+            <% include JonoM\BetterNavigator\BetterNavigatorExtraDevTools %>
 
         <% end_if %>
 
@@ -128,7 +128,7 @@
 
             </div>
 
-            <% include BetterNavigator\BetterNavigatorExtraDebugging %>
+            <% include JonoM\BetterNavigator\BetterNavigatorExtraDebugging %>
 
         <% end_if %>
 
diff --git a/templates/BetterNavigator/Includes/BetterNavigatorExtraContent.ss b/templates/JonoM/BetterNavigator/Includes/BetterNavigatorExtraContent.ss
similarity index 100%
rename from templates/BetterNavigator/Includes/BetterNavigatorExtraContent.ss
rename to templates/JonoM/BetterNavigator/Includes/BetterNavigatorExtraContent.ss
diff --git a/templates/BetterNavigator/Includes/BetterNavigatorExtraDebugging.ss b/templates/JonoM/BetterNavigator/Includes/BetterNavigatorExtraDebugging.ss
similarity index 100%
rename from templates/BetterNavigator/Includes/BetterNavigatorExtraDebugging.ss
rename to templates/JonoM/BetterNavigator/Includes/BetterNavigatorExtraDebugging.ss
diff --git a/templates/BetterNavigator/Includes/BetterNavigatorExtraDevTools.ss b/templates/JonoM/BetterNavigator/Includes/BetterNavigatorExtraDevTools.ss
similarity index 100%
rename from templates/BetterNavigator/Includes/BetterNavigatorExtraDevTools.ss
rename to templates/JonoM/BetterNavigator/Includes/BetterNavigatorExtraDevTools.ss