diff --git a/Stars Assistant/App.axaml b/Stars Assistant/App.axaml
index d4c757b..9bb9b54 100644
--- a/Stars Assistant/App.axaml	
+++ b/Stars Assistant/App.axaml	
@@ -1,7 +1,7 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="net.nehmer.sa.App"
-             xmlns:local="using:net.nehmer.sa"
+             x:Class="StarsAssistant.App"
+             xmlns:local="using:StarsAssistant"
              RequestedThemeVariant="Default">
              <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
 
diff --git a/Stars Assistant/App.axaml.cs b/Stars Assistant/App.axaml.cs
index 83c81af..c7543d8 100644
--- a/Stars Assistant/App.axaml.cs	
+++ b/Stars Assistant/App.axaml.cs	
@@ -1,10 +1,10 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
-using net.nehmer.sa.ViewModels;
-using net.nehmer.sa.Views;
+using StarsAssistant.ViewModels;
+using StarsAssistant.Views;
 
-namespace net.nehmer.sa;
+namespace StarsAssistant;
 
 public partial class App : Application
 {
diff --git a/Stars Assistant/Model/Planet.cs b/Stars Assistant/Model/Planet.cs
index 39332a2..8ec66f9 100644
--- a/Stars Assistant/Model/Planet.cs	
+++ b/Stars Assistant/Model/Planet.cs	
@@ -2,7 +2,7 @@
 using System.Globalization;
 using CSV = CsvHelper.Configuration.Attributes;
 
-namespace net.nehmer.sa.Model;
+namespace StarsAssistant.Model;
 
 public class Planet
 {
diff --git a/Stars Assistant/Model/StarsDatabase.cs b/Stars Assistant/Model/StarsDatabase.cs
index 46b22b8..ce5729c 100644
--- a/Stars Assistant/Model/StarsDatabase.cs	
+++ b/Stars Assistant/Model/StarsDatabase.cs	
@@ -3,7 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Numerics;
 
-namespace net.nehmer.sa.Model;
+namespace StarsAssistant.Model;
 
 public class StarsDatabase(string DbPath) : DbContext
 {
diff --git a/Stars Assistant/Program.cs b/Stars Assistant/Program.cs
index 3487ed8..08f5c5b 100644
--- a/Stars Assistant/Program.cs	
+++ b/Stars Assistant/Program.cs	
@@ -4,11 +4,11 @@ using Avalonia;
 using Microsoft.EntityFrameworkCore;
 using CsvHelper.Configuration;
 using CsvHelper;
-using net.nehmer.sa.Model;
+using StarsAssistant.Model;
 using System.Globalization;
 
 
-namespace net.nehmer.sa;
+namespace StarsAssistant;
 
 sealed class Program
 {
@@ -66,7 +66,7 @@ sealed class Program
 using Microsoft.EntityFrameworkCore;
 using CsvHelper.Configuration;
 using CsvHelper;
-using net.nehmer.sa.model;
+using StarsAssistant.model;
 
 
 using var db = new StarsDatabase("stars.sqlite");
diff --git a/Stars Assistant/Stars Assistant.csproj b/Stars Assistant/Stars Assistant.csproj
index 0437e7c..3437de0 100644
--- a/Stars Assistant/Stars Assistant.csproj	
+++ b/Stars Assistant/Stars Assistant.csproj	
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
-    <RootNamespace>net.nehmer.sa</RootNamespace>
+    <RootNamespace>StarsAssistant</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
diff --git a/Stars Assistant/ViewLocator.cs b/Stars Assistant/ViewLocator.cs
index ad094ea..0a07b7d 100644
--- a/Stars Assistant/ViewLocator.cs	
+++ b/Stars Assistant/ViewLocator.cs	
@@ -1,9 +1,9 @@
 using System;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
-using net.nehmer.sa.ViewModels;
+using StarsAssistant.ViewModels;
 
-namespace net.nehmer.sa;
+namespace StarsAssistant;
 
 public class ViewLocator : IDataTemplate
 {
diff --git a/Stars Assistant/ViewModels/MainWindowViewModel.cs b/Stars Assistant/ViewModels/MainWindowViewModel.cs
index 2822b9d..1a199f2 100644
--- a/Stars Assistant/ViewModels/MainWindowViewModel.cs	
+++ b/Stars Assistant/ViewModels/MainWindowViewModel.cs	
@@ -1,6 +1,6 @@
 using System.Collections.ObjectModel;
 
-namespace net.nehmer.sa.ViewModels;
+namespace StarsAssistant.ViewModels;
 
 public partial class MainWindowViewModel : ViewModelBase
 {
diff --git a/Stars Assistant/ViewModels/PlanetViewModel.cs b/Stars Assistant/ViewModels/PlanetViewModel.cs
index 5d250f6..2c28fe3 100644
--- a/Stars Assistant/ViewModels/PlanetViewModel.cs	
+++ b/Stars Assistant/ViewModels/PlanetViewModel.cs	
@@ -1,7 +1,7 @@
 using System.Collections.ObjectModel;
-using net.nehmer.sa.Model;
+using StarsAssistant.Model;
 
-namespace net.nehmer.sa.ViewModels;
+namespace StarsAssistant.ViewModels;
 
 public partial class PlanetViewModel(Planet planet) : ViewModelBase
 {
diff --git a/Stars Assistant/ViewModels/ViewModelBase.cs b/Stars Assistant/ViewModels/ViewModelBase.cs
index 8c79838..3d1cbcc 100644
--- a/Stars Assistant/ViewModels/ViewModelBase.cs	
+++ b/Stars Assistant/ViewModels/ViewModelBase.cs	
@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 
-namespace net.nehmer.sa.ViewModels;
+namespace StarsAssistant.ViewModels;
 
 public class ViewModelBase : ObservableObject
 {
diff --git a/Stars Assistant/Views/MainWindow.axaml b/Stars Assistant/Views/MainWindow.axaml
index b906a4a..f09adda 100644
--- a/Stars Assistant/Views/MainWindow.axaml	
+++ b/Stars Assistant/Views/MainWindow.axaml	
@@ -1,10 +1,10 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="using:net.nehmer.sa.ViewModels"
+        xmlns:vm="using:StarsAssistant.ViewModels"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-        x:Class="net.nehmer.sa.Views.MainWindow"
+        x:Class="StarsAssistant.Views.MainWindow"
         x:DataType="vm:MainWindowViewModel"
         Icon="/Assets/avalonia-logo.ico"
         Title="GetStartedApp">
diff --git a/Stars Assistant/Views/MainWindow.axaml.cs b/Stars Assistant/Views/MainWindow.axaml.cs
index d6793f6..41f56c0 100644
--- a/Stars Assistant/Views/MainWindow.axaml.cs	
+++ b/Stars Assistant/Views/MainWindow.axaml.cs	
@@ -3,7 +3,7 @@ using Avalonia.Interactivity;
 using System.Diagnostics;
 using System;
 
-namespace net.nehmer.sa.Views;
+namespace StarsAssistant.Views;
 
 public partial class MainWindow : Window
 {