diff --git a/SDL3-CS.Android/SDL3-CS.Android.csproj b/SDL3-CS.Android/SDL3-CS.Android.csproj
index 4d62153..8d397a9 100644
--- a/SDL3-CS.Android/SDL3-CS.Android.csproj
+++ b/SDL3-CS.Android/SDL3-CS.Android.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0-android</TargetFramework>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
-    <RootNamespace>SDL3.Android</RootNamespace>
+    <RootNamespace>SDL.Android</RootNamespace>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
diff --git a/SDL3-CS.SourceGeneration/Changes.cs b/SDL3-CS.SourceGeneration/Changes.cs
index ce40fa3..9b9e125 100644
--- a/SDL3-CS.SourceGeneration/Changes.cs
+++ b/SDL3-CS.SourceGeneration/Changes.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace SDL3.SourceGeneration
+namespace SDL.SourceGeneration
 {
     [Flags]
     public enum Changes
diff --git a/SDL3-CS.SourceGeneration/FriendlyOverloadGenerator.cs b/SDL3-CS.SourceGeneration/FriendlyOverloadGenerator.cs
index 263488c..ce1538d 100644
--- a/SDL3-CS.SourceGeneration/FriendlyOverloadGenerator.cs
+++ b/SDL3-CS.SourceGeneration/FriendlyOverloadGenerator.cs
@@ -9,7 +9,7 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
-namespace SDL3.SourceGeneration
+namespace SDL.SourceGeneration
 {
     [Generator]
     public class FriendlyOverloadGenerator : ISourceGenerator
diff --git a/SDL3-CS.SourceGeneration/GeneratedMethod.cs b/SDL3-CS.SourceGeneration/GeneratedMethod.cs
index 693d97a..62d80f7 100644
--- a/SDL3-CS.SourceGeneration/GeneratedMethod.cs
+++ b/SDL3-CS.SourceGeneration/GeneratedMethod.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
-namespace SDL3.SourceGeneration
+namespace SDL.SourceGeneration
 {
     public record GeneratedMethod
     {
diff --git a/SDL3-CS.SourceGeneration/Helper.cs b/SDL3-CS.SourceGeneration/Helper.cs
index 42e51d5..17e5853 100644
--- a/SDL3-CS.SourceGeneration/Helper.cs
+++ b/SDL3-CS.SourceGeneration/Helper.cs
@@ -7,7 +7,7 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
-namespace SDL3.SourceGeneration
+namespace SDL.SourceGeneration
 {
     public static class Helper
     {
diff --git a/SDL3-CS.SourceGeneration/SDL3-CS.SourceGeneration.csproj b/SDL3-CS.SourceGeneration/SDL3-CS.SourceGeneration.csproj
index ad9d266..6b75edd 100644
--- a/SDL3-CS.SourceGeneration/SDL3-CS.SourceGeneration.csproj
+++ b/SDL3-CS.SourceGeneration/SDL3-CS.SourceGeneration.csproj
@@ -9,7 +9,7 @@
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
     <IsRoslynComponent>true</IsRoslynComponent>
 
-    <RootNamespace>SDL3.SourceGeneration</RootNamespace>
+    <RootNamespace>SDL.SourceGeneration</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/SDL3-CS.SourceGeneration/UnfriendlyMethodFinder.cs b/SDL3-CS.SourceGeneration/UnfriendlyMethodFinder.cs
index 81f40bc..7f5461f 100644
--- a/SDL3-CS.SourceGeneration/UnfriendlyMethodFinder.cs
+++ b/SDL3-CS.SourceGeneration/UnfriendlyMethodFinder.cs
@@ -9,7 +9,7 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
-namespace SDL3.SourceGeneration
+namespace SDL.SourceGeneration
 {
     public class UnfriendlyMethodFinder : ISyntaxReceiver
     {
diff --git a/SDL3-CS.Tests/MyWindow.cs b/SDL3-CS.Tests/MyWindow.cs
index 351cb24..b8ac88a 100644
--- a/SDL3-CS.Tests/MyWindow.cs
+++ b/SDL3-CS.Tests/MyWindow.cs
@@ -3,10 +3,9 @@
 
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using SDL;
 using static SDL.SDL3;
 
-namespace SDL3.Tests
+namespace SDL.Tests
 {
     public sealed unsafe class MyWindow : IDisposable
     {
diff --git a/SDL3-CS.Tests/ObjectHandle.cs b/SDL3-CS.Tests/ObjectHandle.cs
index 1cd332f..f4c0ae8 100644
--- a/SDL3-CS.Tests/ObjectHandle.cs
+++ b/SDL3-CS.Tests/ObjectHandle.cs
@@ -5,7 +5,7 @@
 
 using System.Runtime.InteropServices;
 
-namespace SDL3.Tests
+namespace SDL.Tests
 {
     /// <summary>
     /// Wrapper on <see cref="GCHandle" /> that supports the <see cref="IDisposable" /> pattern.
diff --git a/SDL3-CS.Tests/Program.cs b/SDL3-CS.Tests/Program.cs
index 3eeccb8..3d731a8 100644
--- a/SDL3-CS.Tests/Program.cs
+++ b/SDL3-CS.Tests/Program.cs
@@ -3,10 +3,9 @@
 
 using System.Diagnostics;
 using System.Text;
-using SDL;
 using static SDL.SDL3;
 
-namespace SDL3.Tests
+namespace SDL.Tests
 {
     public static class Program
     {
diff --git a/SDL3-CS.Tests/SDL3-CS.Tests.csproj b/SDL3-CS.Tests/SDL3-CS.Tests.csproj
index f38b831..129e3d4 100644
--- a/SDL3-CS.Tests/SDL3-CS.Tests.csproj
+++ b/SDL3-CS.Tests/SDL3-CS.Tests.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
-    <RootNamespace>SDL3.Tests</RootNamespace>
+    <RootNamespace>SDL.Tests</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/SDL3-CS.Tests/TestUtf8String.cs b/SDL3-CS.Tests/TestUtf8String.cs
index b879568..c421738 100644
--- a/SDL3-CS.Tests/TestUtf8String.cs
+++ b/SDL3-CS.Tests/TestUtf8String.cs
@@ -2,9 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
-using SDL;
 
-namespace SDL3.Tests
+namespace SDL.Tests
 {
     [TestFixture]
     public class TestUtf8String