diff --git a/NET8Blazor/.run/Run Photino Net.run.xml b/NET8Blazor/.run/Run Photino Net.run.xml
index 5797891..23a243d 100644
--- a/NET8Blazor/.run/Run Photino Net.run.xml	
+++ b/NET8Blazor/.run/Run Photino Net.run.xml	
@@ -8,7 +8,7 @@
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
     <option name="RUNTIME_TYPE" value="coreclr" />
-    <option name="PROJECT_PATH" value="$PROJECT_DIR$/PhotinoNetAbpp/PhotinoNetAbpp.csproj" />
+    <option name="PROJECT_PATH" value="$PROJECT_DIR$/PhotinoNetApp/PhotinoNetApp.csproj" />
     <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
diff --git a/NET8Blazor/NET8Blazor.sln b/NET8Blazor/NET8Blazor.sln
index 83e3c33..ac16842 100644
--- a/NET8Blazor/NET8Blazor.sln
+++ b/NET8Blazor/NET8Blazor.sln
@@ -4,7 +4,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhotinoBlazorApp", "Photino
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApp", "WebApp\WebApp.csproj", "{A7F41192-8FD5-4511-A722-741C4AA60E82}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhotinoNetAbpp", "PhotinoNetAbpp\PhotinoNetAbpp.csproj", "{90B9EB5C-CDA8-46B0-B856-A083AD2A96D9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhotinoNetApp", "PhotinoNetApp\PhotinoNetApp.csproj", "{90B9EB5C-CDA8-46B0-B856-A083AD2A96D9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/NET8Blazor/PhotinoNetAbpp/Components/App.razor b/NET8Blazor/PhotinoNetApp/Components/App.razor
similarity index 100%
rename from NET8Blazor/PhotinoNetAbpp/Components/App.razor
rename to NET8Blazor/PhotinoNetApp/Components/App.razor
diff --git a/NET8Blazor/PhotinoNetAbpp/Components/Layout/MainLayout.razor b/NET8Blazor/PhotinoNetApp/Components/Layout/MainLayout.razor
similarity index 100%
rename from NET8Blazor/PhotinoNetAbpp/Components/Layout/MainLayout.razor
rename to NET8Blazor/PhotinoNetApp/Components/Layout/MainLayout.razor
diff --git a/NET8Blazor/PhotinoNetAbpp/Components/Layout/NavMenu.razor b/NET8Blazor/PhotinoNetApp/Components/Layout/NavMenu.razor
similarity index 93%
rename from NET8Blazor/PhotinoNetAbpp/Components/Layout/NavMenu.razor
rename to NET8Blazor/PhotinoNetApp/Components/Layout/NavMenu.razor
index c2d55d2..09d4934 100644
--- a/NET8Blazor/PhotinoNetAbpp/Components/Layout/NavMenu.razor
+++ b/NET8Blazor/PhotinoNetApp/Components/Layout/NavMenu.razor
@@ -1,6 +1,6 @@
 <div class="top-row ps-3 navbar navbar-dark">
     <div class="container-fluid">
-        <a class="navbar-brand" href="">PhotinoNetAbpp</a>
+        <a class="navbar-brand" href="">PhotinoNetApp</a>
     </div>
 </div>
 
diff --git a/NET8Blazor/PhotinoNetAbpp/Components/Pages/Counter.razor b/NET8Blazor/PhotinoNetApp/Components/Pages/Counter.razor
similarity index 100%
rename from NET8Blazor/PhotinoNetAbpp/Components/Pages/Counter.razor
rename to NET8Blazor/PhotinoNetApp/Components/Pages/Counter.razor
diff --git a/NET8Blazor/PhotinoNetAbpp/Components/Pages/Error.razor b/NET8Blazor/PhotinoNetApp/Components/Pages/Error.razor
similarity index 100%
rename from NET8Blazor/PhotinoNetAbpp/Components/Pages/Error.razor
rename to NET8Blazor/PhotinoNetApp/Components/Pages/Error.razor
diff --git a/NET8Blazor/PhotinoNetAbpp/Components/Pages/Home.razor b/NET8Blazor/PhotinoNetApp/Components/Pages/Home.razor
similarity index 100%
rename from NET8Blazor/PhotinoNetAbpp/Components/Pages/Home.razor
rename to NET8Blazor/PhotinoNetApp/Components/Pages/Home.razor
diff --git a/NET8Blazor/PhotinoNetAbpp/Components/Pages/Weather.razor b/NET8Blazor/PhotinoNetApp/Components/Pages/Weather.razor
similarity index 100%
rename from NET8Blazor/PhotinoNetAbpp/Components/Pages/Weather.razor
rename to NET8Blazor/PhotinoNetApp/Components/Pages/Weather.razor
diff --git a/NET8Blazor/PhotinoNetAbpp/Components/Routes.razor b/NET8Blazor/PhotinoNetApp/Components/Routes.razor
similarity index 100%
rename from NET8Blazor/PhotinoNetAbpp/Components/Routes.razor
rename to NET8Blazor/PhotinoNetApp/Components/Routes.razor
diff --git a/NET8Blazor/PhotinoNetAbpp/Components/_Imports.razor b/NET8Blazor/PhotinoNetApp/Components/_Imports.razor
similarity index 100%
rename from NET8Blazor/PhotinoNetAbpp/Components/_Imports.razor
rename to NET8Blazor/PhotinoNetApp/Components/_Imports.razor
diff --git a/NET8Blazor/PhotinoNetAbpp/PhotinoNetAbpp.csproj b/NET8Blazor/PhotinoNetApp/PhotinoNetApp.csproj
similarity index 88%
rename from NET8Blazor/PhotinoNetAbpp/PhotinoNetAbpp.csproj
rename to NET8Blazor/PhotinoNetApp/PhotinoNetApp.csproj
index f9ed23a..f492da5 100644
--- a/NET8Blazor/PhotinoNetAbpp/PhotinoNetAbpp.csproj
+++ b/NET8Blazor/PhotinoNetApp/PhotinoNetApp.csproj
@@ -4,6 +4,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
+        <RootNamespace>PhotinoNetAbpp</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/NET8Blazor/PhotinoNetAbpp/Program.cs b/NET8Blazor/PhotinoNetApp/Program.cs
similarity index 90%
rename from NET8Blazor/PhotinoNetAbpp/Program.cs
rename to NET8Blazor/PhotinoNetApp/Program.cs
index fa94304..c0a76f6 100644
--- a/NET8Blazor/PhotinoNetAbpp/Program.cs
+++ b/NET8Blazor/PhotinoNetApp/Program.cs
@@ -19,7 +19,7 @@ app.UseAntiforgery();
 app.MapRazorComponents<App>()
     .AddInteractiveServerRenderMode();
 
-var webServerCancellation = new CancellationTokenSource();
+using var webServerCancellation = new CancellationTokenSource();
 var webServerTask = app.RunAsync(webServerCancellation.Token);
 
 var window = new PhotinoWindow()
diff --git a/NET8Blazor/PhotinoNetAbpp/wwwroot/bootstrap/bootstrap.min.css.map b/NET8Blazor/PhotinoNetApp/wwwroot/bootstrap/bootstrap.min.css.map
similarity index 100%
rename from NET8Blazor/PhotinoNetAbpp/wwwroot/bootstrap/bootstrap.min.css.map
rename to NET8Blazor/PhotinoNetApp/wwwroot/bootstrap/bootstrap.min.css.map
diff --git a/NET8Blazor/PhotinoNetAbpp/wwwroot/favicon.png b/NET8Blazor/PhotinoNetApp/wwwroot/favicon.png
similarity index 100%
rename from NET8Blazor/PhotinoNetAbpp/wwwroot/favicon.png
rename to NET8Blazor/PhotinoNetApp/wwwroot/favicon.png