diff --git a/content/application/.template.config/template.json b/content/application/.template.config/template.json
index 5320d3c..ce94804 100644
--- a/content/application/.template.config/template.json
+++ b/content/application/.template.config/template.json
@@ -9,7 +9,7 @@
   "identity": "Bolero.Application.Template",
   "groupIdentity": "Bolero.Application",
   "shortName": "bolero-app",
-  "sourceName": "Bolero.Template",
+  "sourceName": "Bolero.Template.1",
   "preferNameDirectory": true,
   "symbols": {
     "minimal": {
diff --git a/content/application/Bolero.Template.sln b/content/application/Bolero.Template.1.sln
similarity index 93%
rename from content/application/Bolero.Template.sln
rename to content/application/Bolero.Template.1.sln
index 49ef20d..00b2d87 100644
--- a/content/application/Bolero.Template.sln
+++ b/content/application/Bolero.Template.1.sln
@@ -13,10 +13,10 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{87F6C079-CBD7-4866-BDEB-CBDEA9E51D2A}"
 EndProject
 //#if (server)
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Bolero.Template.Server", "src\Bolero.Template.Server\Bolero.Template.Server.fsproj", "{4E2AA925-4694-4593-ADBC-F349D269587A}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Bolero.Template.1.Server", "src\Bolero.Template.1.Server\Bolero.Template.1.Server.fsproj", "{4E2AA925-4694-4593-ADBC-F349D269587A}"
 EndProject
 //#endif
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Bolero.Template.Client", "src\Bolero.Template.Client\Bolero.Template.Client.fsproj", "{1481BBD6-A6DA-4912-A03A-134880D14701}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Bolero.Template.1.Client", "src\Bolero.Template.1.Client\Bolero.Template.1.Client.fsproj", "{1481BBD6-A6DA-4912-A03A-134880D14701}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/content/application/src/Bolero.Template.Client/Bolero.Template.Client.fsproj b/content/application/src/Bolero.Template.1.Client/Bolero.Template.Client.fsproj
similarity index 100%
rename from content/application/src/Bolero.Template.Client/Bolero.Template.Client.fsproj
rename to content/application/src/Bolero.Template.1.Client/Bolero.Template.Client.fsproj
diff --git a/content/application/src/Bolero.Template.Client/Main.fs b/content/application/src/Bolero.Template.1.Client/Main.fs
similarity index 99%
rename from content/application/src/Bolero.Template.Client/Main.fs
rename to content/application/src/Bolero.Template.1.Client/Main.fs
index d39c322..6964ace 100644
--- a/content/application/src/Bolero.Template.Client/Main.fs
+++ b/content/application/src/Bolero.Template.1.Client/Main.fs
@@ -1,4 +1,4 @@
-module Bolero.Template.Client.Main
+module Bolero.Template._1.Client.Main
 
 open System
 //#if (!server)
diff --git a/content/application/src/Bolero.Template.Client/Main.minimal.fs b/content/application/src/Bolero.Template.1.Client/Main.minimal.fs
similarity index 93%
rename from content/application/src/Bolero.Template.Client/Main.minimal.fs
rename to content/application/src/Bolero.Template.1.Client/Main.minimal.fs
index e360f7f..5698e8d 100644
--- a/content/application/src/Bolero.Template.Client/Main.minimal.fs
+++ b/content/application/src/Bolero.Template.1.Client/Main.minimal.fs
@@ -1,4 +1,4 @@
-module Bolero.Template.Client.Main
+module Bolero.Template._1.Client.Main
 
 open Elmish
 open Bolero
diff --git a/content/application/src/Bolero.Template.Client/Properties/launchSettings.json b/content/application/src/Bolero.Template.1.Client/Properties/launchSettings.json
similarity index 94%
rename from content/application/src/Bolero.Template.Client/Properties/launchSettings.json
rename to content/application/src/Bolero.Template.1.Client/Properties/launchSettings.json
index 14fb535..1ef320f 100644
--- a/content/application/src/Bolero.Template.Client/Properties/launchSettings.json
+++ b/content/application/src/Bolero.Template.1.Client/Properties/launchSettings.json
@@ -15,7 +15,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "Bolero.Template.Client": {
+    "Bolero.Template._1.Client": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
@@ -24,4 +24,4 @@
       "applicationUrl": "http://localhost:51067/"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/content/application/src/Bolero.Template.Client/Startup.fs b/content/application/src/Bolero.Template.1.Client/Startup.fs
similarity index 95%
rename from content/application/src/Bolero.Template.Client/Startup.fs
rename to content/application/src/Bolero.Template.1.Client/Startup.fs
index 3ab581f..04dcd9c 100644
--- a/content/application/src/Bolero.Template.Client/Startup.fs
+++ b/content/application/src/Bolero.Template.1.Client/Startup.fs
@@ -1,4 +1,4 @@
-namespace Bolero.Template.Client
+namespace Bolero.Template._1.Client
 
 open Microsoft.AspNetCore.Components.WebAssembly.Hosting
 //#if (server)
diff --git a/content/application/src/Bolero.Template.Client/paket.references b/content/application/src/Bolero.Template.1.Client/paket.references
similarity index 100%
rename from content/application/src/Bolero.Template.Client/paket.references
rename to content/application/src/Bolero.Template.1.Client/paket.references
diff --git a/content/application/src/Bolero.Template.Client/wwwroot/books.json b/content/application/src/Bolero.Template.1.Client/wwwroot/books.json
similarity index 100%
rename from content/application/src/Bolero.Template.Client/wwwroot/books.json
rename to content/application/src/Bolero.Template.1.Client/wwwroot/books.json
diff --git a/content/application/src/Bolero.Template.Client/wwwroot/css/index.css b/content/application/src/Bolero.Template.1.Client/wwwroot/css/index.css
similarity index 100%
rename from content/application/src/Bolero.Template.Client/wwwroot/css/index.css
rename to content/application/src/Bolero.Template.1.Client/wwwroot/css/index.css
diff --git a/content/application/src/Bolero.Template.Client/wwwroot/favicon.ico b/content/application/src/Bolero.Template.1.Client/wwwroot/favicon.ico
similarity index 100%
rename from content/application/src/Bolero.Template.Client/wwwroot/favicon.ico
rename to content/application/src/Bolero.Template.1.Client/wwwroot/favicon.ico
diff --git a/content/application/src/Bolero.Template.Client/wwwroot/icon-512.png b/content/application/src/Bolero.Template.1.Client/wwwroot/icon-512.png
similarity index 100%
rename from content/application/src/Bolero.Template.Client/wwwroot/icon-512.png
rename to content/application/src/Bolero.Template.1.Client/wwwroot/icon-512.png
diff --git a/content/application/src/Bolero.Template.Client/wwwroot/index.html b/content/application/src/Bolero.Template.1.Client/wwwroot/index.html
similarity index 94%
rename from content/application/src/Bolero.Template.Client/wwwroot/index.html
rename to content/application/src/Bolero.Template.1.Client/wwwroot/index.html
index 284267e..9bca33c 100644
--- a/content/application/src/Bolero.Template.Client/wwwroot/index.html
+++ b/content/application/src/Bolero.Template.1.Client/wwwroot/index.html
@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.4/css/bulma.min.css">
     <link rel="stylesheet" href="css/index.css">
     <!-- //#endif -->
-    <link rel="stylesheet" href="Bolero.Template.Client.styles.css">
+    <link rel="stylesheet" href="Bolero.Template._1.Client.styles.css">
     <!-- //#if (pwa) -->
     <link href="manifest.json" rel="manifest" />
     <link rel="apple-touch-icon" sizes="512x512" href="icon-512.png" />
diff --git a/content/application/src/Bolero.Template.Client/wwwroot/main.html b/content/application/src/Bolero.Template.1.Client/wwwroot/main.html
similarity index 100%
rename from content/application/src/Bolero.Template.Client/wwwroot/main.html
rename to content/application/src/Bolero.Template.1.Client/wwwroot/main.html
diff --git a/content/application/src/Bolero.Template.Client/wwwroot/manifest.json b/content/application/src/Bolero.Template.1.Client/wwwroot/manifest.json
similarity index 100%
rename from content/application/src/Bolero.Template.Client/wwwroot/manifest.json
rename to content/application/src/Bolero.Template.1.Client/wwwroot/manifest.json
diff --git a/content/application/src/Bolero.Template.Client/wwwroot/service-worker.js b/content/application/src/Bolero.Template.1.Client/wwwroot/service-worker.js
similarity index 100%
rename from content/application/src/Bolero.Template.Client/wwwroot/service-worker.js
rename to content/application/src/Bolero.Template.1.Client/wwwroot/service-worker.js
diff --git a/content/application/src/Bolero.Template.Client/wwwroot/service-worker.published.js b/content/application/src/Bolero.Template.1.Client/wwwroot/service-worker.published.js
similarity index 100%
rename from content/application/src/Bolero.Template.Client/wwwroot/service-worker.published.js
rename to content/application/src/Bolero.Template.1.Client/wwwroot/service-worker.published.js
diff --git a/content/application/src/Bolero.Template.Server/Bolero.Template.Server.fsproj b/content/application/src/Bolero.Template.1.Server/Bolero.Template.Server.fsproj
similarity index 92%
rename from content/application/src/Bolero.Template.Server/Bolero.Template.Server.fsproj
rename to content/application/src/Bolero.Template.1.Server/Bolero.Template.Server.fsproj
index 046867d..eed5812 100644
--- a/content/application/src/Bolero.Template.Server/Bolero.Template.Server.fsproj
+++ b/content/application/src/Bolero.Template.1.Server/Bolero.Template.Server.fsproj
@@ -13,7 +13,7 @@
     <Compile Include="Startup.fs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Bolero.Template.Client\Bolero.Template.Client.fsproj" />
+    <ProjectReference Include="..\Bolero.Template.1.Client\Bolero.Template.1.Client.fsproj" />
   </ItemGroup>
   <!-- //#if (paket) -->
   <Import Project="..\..\.paket\Paket.Restore.targets" />
diff --git a/content/application/src/Bolero.Template.Server/BookService.fs b/content/application/src/Bolero.Template.1.Server/BookService.fs
similarity index 96%
rename from content/application/src/Bolero.Template.Server/BookService.fs
rename to content/application/src/Bolero.Template.1.Server/BookService.fs
index 59f4152..24b64bc 100644
--- a/content/application/src/Bolero.Template.Server/BookService.fs
+++ b/content/application/src/Bolero.Template.1.Server/BookService.fs
@@ -1,4 +1,4 @@
-namespace Bolero.Template.Server
+namespace Bolero.Template._1.Server
 
 open System
 open System.IO
@@ -8,7 +8,7 @@ open Microsoft.AspNetCore.Hosting
 open Bolero
 open Bolero.Remoting
 open Bolero.Remoting.Server
-open Bolero.Template
+open Bolero.Template._1
 
 type BookService(ctx: IRemoteContext, env: IWebHostEnvironment) =
     inherit RemoteHandler<Client.Main.BookService>()
diff --git a/content/application/src/Bolero.Template.Server/Index.fs b/content/application/src/Bolero.Template.1.Server/Index.fs
similarity index 94%
rename from content/application/src/Bolero.Template.Server/Index.fs
rename to content/application/src/Bolero.Template.1.Server/Index.fs
index 2f7f3ce..19399d3 100644
--- a/content/application/src/Bolero.Template.Server/Index.fs
+++ b/content/application/src/Bolero.Template.1.Server/Index.fs
@@ -1,9 +1,9 @@
-module Bolero.Template.Server.Index
+module Bolero.Template._1.Server.Index
 
 open Bolero
 open Bolero.Html
 open Bolero.Server.Html
-open Bolero.Template
+open Bolero.Template._1
 
 let page = doctypeHtml {
     head {
@@ -15,7 +15,7 @@ let page = doctypeHtml {
         link { attr.rel "stylesheet"; attr.href "https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.4/css/bulma.min.css" }
         link { attr.rel "stylesheet"; attr.href "css/index.css" }
 //#endif
-        link { attr.rel "stylesheet"; attr.href "Bolero.Template.Client.styles.css" }
+        link { attr.rel "stylesheet"; attr.href "Bolero.Template._1.Client.styles.css" }
 //#if (pwa)
         link { attr.rel "manifest"; attr.href "manifest.json" }
         link { attr.rel "apple-touch-icon"; attr.sizes "512x512"; attr.href "icon-512.png" }
diff --git a/content/application/src/Bolero.Template.Server/Pages/_Host.cshtml b/content/application/src/Bolero.Template.1.Server/Pages/_Host.cshtml
similarity index 89%
rename from content/application/src/Bolero.Template.Server/Pages/_Host.cshtml
rename to content/application/src/Bolero.Template.1.Server/Pages/_Host.cshtml
index 8f51bbe..097c96b 100644
--- a/content/application/src/Bolero.Template.Server/Pages/_Host.cshtml
+++ b/content/application/src/Bolero.Template.1.Server/Pages/_Host.cshtml
@@ -1,5 +1,5 @@
 @page "/"
-@namespace Bolero.Template.Server
+@namespace Bolero.Template._1.Server
 @using Bolero.Server.RazorHost
 @inject IBoleroHostConfig BoleroHostConfig
 <!DOCTYPE html>
@@ -13,7 +13,7 @@
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.4/css/bulma.min.css">
     <link rel="stylesheet" href="css/index.css">
     <!-- //#endif -->
-    <link rel="stylesheet" href="Bolero.Template.Client.styles.css">
+    <link rel="stylesheet" href="Bolero.Template._1.Client.styles.css">
     <!-- //#if (pwa) -->
     <link href="manifest.json" rel="manifest" />
     <link rel="apple-touch-icon" sizes="512x512" href="icon-512.png" />
@@ -31,7 +31,7 @@
       </div>
     </nav>
     <!-- //#endif -->
-    <div id="main">@(await Html.RenderComponentAsync<Bolero.Template.Client.Main.MyApp>(BoleroHostConfig))</div>
+    <div id="main">@(await Html.RenderComponentAsync<Bolero.Template.1.Client.Main.MyApp>(BoleroHostConfig))</div>
     @Html.RenderBoleroScript(BoleroHostConfig)
     <!-- //#if (pwa) -->
     <script>navigator.serviceWorker.register('service-worker.js');</script>
diff --git a/content/application/src/Bolero.Template.Server/Properties/launchSettings.json b/content/application/src/Bolero.Template.1.Server/Properties/launchSettings.json
similarity index 100%
rename from content/application/src/Bolero.Template.Server/Properties/launchSettings.json
rename to content/application/src/Bolero.Template.1.Server/Properties/launchSettings.json
diff --git a/content/application/src/Bolero.Template.Server/Startup.fs b/content/application/src/Bolero.Template.1.Server/Startup.fs
similarity index 96%
rename from content/application/src/Bolero.Template.Server/Startup.fs
rename to content/application/src/Bolero.Template.1.Server/Startup.fs
index 8cbf2e6..60d649a 100644
--- a/content/application/src/Bolero.Template.Server/Startup.fs
+++ b/content/application/src/Bolero.Template.1.Server/Startup.fs
@@ -1,4 +1,4 @@
-namespace Bolero.Template.Server
+namespace Bolero.Template._1.Server
 
 open Microsoft.AspNetCore
 open Microsoft.AspNetCore.Authentication.Cookies
@@ -9,7 +9,7 @@ open Microsoft.Extensions.Hosting
 open Bolero
 open Bolero.Remoting.Server
 open Bolero.Server
-open Bolero.Template
+open Bolero.Template._1
 //#if (hotreload_actual)
 open Bolero.Templating.Server
 //#endif
@@ -38,7 +38,7 @@ type Startup() =
 //#endif
 //#if (hotreload_actual)
 #if DEBUG
-            .AddHotReload(templateDir = __SOURCE_DIRECTORY__ + "/../Bolero.Template.Client")
+            .AddHotReload(templateDir = __SOURCE_DIRECTORY__ + "/../Bolero.Template.1.Client")
 #endif
 //#endif
         |> ignore
diff --git a/content/application/src/Bolero.Template.Server/paket.references b/content/application/src/Bolero.Template.1.Server/paket.references
similarity index 100%
rename from content/application/src/Bolero.Template.Server/paket.references
rename to content/application/src/Bolero.Template.1.Server/paket.references