diff --git a/Dax.Vpax.Obfuscator.CI.slnf b/Dax.Vpax.Obfuscator.CI.slnf
index 60e8f59..2b722b6 100644
--- a/Dax.Vpax.Obfuscator.CI.slnf
+++ b/Dax.Vpax.Obfuscator.CI.slnf
@@ -5,7 +5,7 @@
       "src\\Dax.Vpax.Obfuscator.CLI\\Dax.Vpax.Obfuscator.CLI.csproj",
       "src\\Dax.Vpax.Obfuscator.Common\\Dax.Vpax.Obfuscator.Common.csproj",
       "src\\Dax.Vpax.Obfuscator\\Dax.Vpax.Obfuscator.csproj",
-      "src\\TabularEditor.Dax.Tokenizer\\TabularEditor.Dax.Tokenizer.csproj",
+      "src\\Dax.Tokenizer\\Dax.Tokenizer.csproj",
       "tests\\Dax.Vpax.Obfuscator.Common.Tests\\Dax.Vpax.Obfuscator.Common.Tests.csproj",
       "tests\\Dax.Vpax.Obfuscator.Tests\\Dax.Vpax.Obfuscator.Tests.csproj"
     ]
diff --git a/Dax.Vpax.Obfuscator.sln b/Dax.Vpax.Obfuscator.sln
index 157dc99..9fe69b8 100644
--- a/Dax.Vpax.Obfuscator.sln
+++ b/Dax.Vpax.Obfuscator.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 17.1.32414.318
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Vpax.Obfuscator.Common", "src\Dax.Vpax.Obfuscator.Common\Dax.Vpax.Obfuscator.Common.csproj", "{80F06AB5-55E7-4190-9ADB-0724B9AD5509}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TabularEditor.Dax.Tokenizer", "src\TabularEditor.Dax.Tokenizer\TabularEditor.Dax.Tokenizer.csproj", "{D1B0052F-6048-4FFC-A7F3-93DD27351077}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Tokenizer", "src\Dax.Tokenizer\Dax.Tokenizer.csproj", "{D1B0052F-6048-4FFC-A7F3-93DD27351077}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Vpax.Obfuscator.Common.Tests", "tests\Dax.Vpax.Obfuscator.Common.Tests\Dax.Vpax.Obfuscator.Common.Tests.csproj", "{1887308A-AB4C-40D4-B13A-B5240D4E90F6}"
 EndProject
diff --git a/src/TabularEditor.Dax.Tokenizer/TabularEditor.Dax.Tokenizer.csproj b/src/Dax.Tokenizer/Dax.Tokenizer.csproj
similarity index 88%
rename from src/TabularEditor.Dax.Tokenizer/TabularEditor.Dax.Tokenizer.csproj
rename to src/Dax.Tokenizer/Dax.Tokenizer.csproj
index f45257a..47dc765 100644
--- a/src/TabularEditor.Dax.Tokenizer/TabularEditor.Dax.Tokenizer.csproj
+++ b/src/Dax.Tokenizer/Dax.Tokenizer.csproj
@@ -9,7 +9,7 @@
     <Authors>Tabular Editor ApS</Authors>
     <Company>Tabular Editor ApS</Company>
     <Product>Dax Tokenizer</Product>
-    <PackageProjectUrl>https://github.com/sql-bi/Vpax-Obfuscator/tree/main/src/TabularEditor.Dax.Tokenizer</PackageProjectUrl>
+    <PackageProjectUrl>https://github.com/sql-bi/Vpax-Obfuscator/tree/main/src/Dax.Tokenizer</PackageProjectUrl>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/TabularEditor.Dax.Tokenizer/DaxCharStream.cs b/src/Dax.Tokenizer/DaxCharStream.cs
similarity index 97%
rename from src/TabularEditor.Dax.Tokenizer/DaxCharStream.cs
rename to src/Dax.Tokenizer/DaxCharStream.cs
index dc4ff26..2cf5d5b 100644
--- a/src/TabularEditor.Dax.Tokenizer/DaxCharStream.cs
+++ b/src/Dax.Tokenizer/DaxCharStream.cs
@@ -1,7 +1,7 @@
 using Antlr4.Runtime;
 using Antlr4.Runtime.Misc;
 
-namespace TabularEditor.Dax.Tokenizer
+namespace Dax.Tokenizer
 {
     public class DaxCharStream : ICharStream
     {
@@ -78,4 +78,4 @@ public void Seek(int index)
             stream.Seek(index);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/TabularEditor.Dax.Tokenizer/DaxLexer.cs b/src/Dax.Tokenizer/DaxLexer.cs
similarity index 90%
rename from src/TabularEditor.Dax.Tokenizer/DaxLexer.cs
rename to src/Dax.Tokenizer/DaxLexer.cs
index 7ebf64e..03b0ac0 100644
--- a/src/TabularEditor.Dax.Tokenizer/DaxLexer.cs
+++ b/src/Dax.Tokenizer/DaxLexer.cs
@@ -1,6 +1,6 @@
 using Antlr4.Runtime;
 
-namespace TabularEditor.Dax.Tokenizer
+namespace Dax.Tokenizer
 {
     internal partial class DaxLexer
     {
diff --git a/src/TabularEditor.Dax.Tokenizer/DaxLexer.generated.cs b/src/Dax.Tokenizer/DaxLexer.generated.cs
similarity index 99%
rename from src/TabularEditor.Dax.Tokenizer/DaxLexer.generated.cs
rename to src/Dax.Tokenizer/DaxLexer.generated.cs
index c587589..e580bf2 100644
--- a/src/TabularEditor.Dax.Tokenizer/DaxLexer.generated.cs
+++ b/src/Dax.Tokenizer/DaxLexer.generated.cs
@@ -17,7 +17,7 @@
 // Ambiguous reference in cref attribute
 #pragma warning disable 419
 
-namespace TabularEditor.Dax.Tokenizer {
+namespace Dax.Tokenizer {
 #pragma warning disable 3021
 using System;
 using System.IO;
diff --git a/src/TabularEditor.Dax.Tokenizer/DaxLocale.cs b/src/Dax.Tokenizer/DaxLocale.cs
similarity index 89%
rename from src/TabularEditor.Dax.Tokenizer/DaxLocale.cs
rename to src/Dax.Tokenizer/DaxLocale.cs
index c391ec4..949a7dd 100644
--- a/src/TabularEditor.Dax.Tokenizer/DaxLocale.cs
+++ b/src/Dax.Tokenizer/DaxLocale.cs
@@ -1,4 +1,4 @@
-namespace TabularEditor.Dax.Tokenizer
+namespace Dax.Tokenizer
 {
     public enum DaxLocale
     {
diff --git a/src/TabularEditor.Dax.Tokenizer/DaxToken.cs b/src/Dax.Tokenizer/DaxToken.cs
similarity index 98%
rename from src/TabularEditor.Dax.Tokenizer/DaxToken.cs
rename to src/Dax.Tokenizer/DaxToken.cs
index c195813..f3ab1d0 100644
--- a/src/TabularEditor.Dax.Tokenizer/DaxToken.cs
+++ b/src/Dax.Tokenizer/DaxToken.cs
@@ -1,6 +1,6 @@
 using Antlr4.Runtime;
 
-namespace TabularEditor.Dax.Tokenizer
+namespace Dax.Tokenizer
 {
     public sealed partial class DaxToken
     {
diff --git a/src/TabularEditor.Dax.Tokenizer/DaxToken.generated.cs b/src/Dax.Tokenizer/DaxToken.generated.cs
similarity index 99%
rename from src/TabularEditor.Dax.Tokenizer/DaxToken.generated.cs
rename to src/Dax.Tokenizer/DaxToken.generated.cs
index 3743a38..482a98b 100644
--- a/src/TabularEditor.Dax.Tokenizer/DaxToken.generated.cs
+++ b/src/Dax.Tokenizer/DaxToken.generated.cs
@@ -1,4 +1,4 @@
-namespace TabularEditor.Dax.Tokenizer
+namespace Dax.Tokenizer
 {
     public sealed partial class DaxToken
     {
@@ -225,4 +225,4 @@ public sealed partial class DaxToken
 	    /// <summary>https://dax.guide/UNKNOWN_CHAR</summary>
 	    public const int UNKNOWN_CHAR=111;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/TabularEditor.Dax.Tokenizer/DaxTokenizer.cs b/src/Dax.Tokenizer/DaxTokenizer.cs
similarity index 98%
rename from src/TabularEditor.Dax.Tokenizer/DaxTokenizer.cs
rename to src/Dax.Tokenizer/DaxTokenizer.cs
index aa8e96c..209c16d 100644
--- a/src/TabularEditor.Dax.Tokenizer/DaxTokenizer.cs
+++ b/src/Dax.Tokenizer/DaxTokenizer.cs
@@ -1,6 +1,6 @@
 using Antlr4.Runtime;
 
-namespace TabularEditor.Dax.Tokenizer
+namespace Dax.Tokenizer
 {
     public static class DaxTokenizer
     {
diff --git a/src/Dax.Tokenizer/README.md b/src/Dax.Tokenizer/README.md
new file mode 100644
index 0000000..eba380e
--- /dev/null
+++ b/src/Dax.Tokenizer/README.md
@@ -0,0 +1,3 @@
+# Dax.Tokenizer
+
+TODO
diff --git a/src/TabularEditor.Dax.Tokenizer/version.json b/src/Dax.Tokenizer/version.json
similarity index 100%
rename from src/TabularEditor.Dax.Tokenizer/version.json
rename to src/Dax.Tokenizer/version.json
diff --git a/src/Dax.Vpax.Obfuscator/Dax.Vpax.Obfuscator.csproj b/src/Dax.Vpax.Obfuscator/Dax.Vpax.Obfuscator.csproj
index 8c62b83..d4c7da5 100644
--- a/src/Dax.Vpax.Obfuscator/Dax.Vpax.Obfuscator.csproj
+++ b/src/Dax.Vpax.Obfuscator/Dax.Vpax.Obfuscator.csproj
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Dax.Vpax.Obfuscator.Common\Dax.Vpax.Obfuscator.Common.csproj" PrivateAssets="all" />
-    <ProjectReference Include="..\TabularEditor.Dax.Tokenizer\TabularEditor.Dax.Tokenizer.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Dax.Tokenizer\Dax.Tokenizer.csproj" PrivateAssets="all" />
   </ItemGroup>
   
   <ItemGroup>
@@ -32,7 +32,7 @@
       <BuildAction>None</BuildAction>
       <PackagePath>lib\net462\</PackagePath>
     </_PackageFiles>
-    <_PackageFiles Include="$(OutputPath.TrimEnd('\').TrimEnd('/'))_net462\TabularEditor.Dax.Tokenizer.dll">
+    <_PackageFiles Include="$(OutputPath.TrimEnd('\').TrimEnd('/'))_net462\Dax.Tokenizer.dll">
       <BuildAction>None</BuildAction>
       <PackagePath>lib\net462\</PackagePath>
     </_PackageFiles>
@@ -41,7 +41,7 @@
       <BuildAction>None</BuildAction>
       <PackagePath>lib\netcoreapp3.1\</PackagePath>
     </_PackageFiles>
-    <_PackageFiles Include="$(OutputPath.TrimEnd('\').TrimEnd('/'))_netcoreapp3.1\TabularEditor.Dax.Tokenizer.dll">
+    <_PackageFiles Include="$(OutputPath.TrimEnd('\').TrimEnd('/'))_netcoreapp3.1\Dax.Tokenizer.dll">
       <BuildAction>None</BuildAction>
       <PackagePath>lib\netcoreapp3.1\</PackagePath>
     </_PackageFiles>
@@ -50,7 +50,7 @@
       <BuildAction>None</BuildAction>
       <PackagePath>lib\net6.0\</PackagePath>
     </_PackageFiles>
-    <_PackageFiles Include="$(OutputPath.TrimEnd('\').TrimEnd('/'))_net6.0\TabularEditor.Dax.Tokenizer.dll">
+    <_PackageFiles Include="$(OutputPath.TrimEnd('\').TrimEnd('/'))_net6.0\Dax.Tokenizer.dll">
       <BuildAction>None</BuildAction>
       <PackagePath>lib\net6.0\</PackagePath>
     </_PackageFiles>
@@ -59,7 +59,7 @@
       <BuildAction>None</BuildAction>
       <PackagePath>lib\net8.0\</PackagePath>
     </_PackageFiles>
-    <_PackageFiles Include="$(OutputPath.TrimEnd('\').TrimEnd('/'))_net8.0\TabularEditor.Dax.Tokenizer.dll">
+    <_PackageFiles Include="$(OutputPath.TrimEnd('\').TrimEnd('/'))_net8.0\Dax.Tokenizer.dll">
       <BuildAction>None</BuildAction>
       <PackagePath>lib\net8.0\</PackagePath>
     </_PackageFiles>
diff --git a/src/Dax.Vpax.Obfuscator/DaxModelDeobfuscator.DeobfuscateExpression.cs b/src/Dax.Vpax.Obfuscator/DaxModelDeobfuscator.DeobfuscateExpression.cs
index 81b4688..f597444 100644
--- a/src/Dax.Vpax.Obfuscator/DaxModelDeobfuscator.DeobfuscateExpression.cs
+++ b/src/Dax.Vpax.Obfuscator/DaxModelDeobfuscator.DeobfuscateExpression.cs
@@ -1,6 +1,6 @@
 using Dax.Vpax.Obfuscator.Extensions;
 using System.Text;
-using TabularEditor.Dax.Tokenizer;
+using Dax.Tokenizer;
 
 namespace Dax.Vpax.Obfuscator;
 
diff --git a/src/Dax.Vpax.Obfuscator/DaxModelObfuscator.ObfuscateExpression.cs b/src/Dax.Vpax.Obfuscator/DaxModelObfuscator.ObfuscateExpression.cs
index ffda54f..3fd3fa3 100644
--- a/src/Dax.Vpax.Obfuscator/DaxModelObfuscator.ObfuscateExpression.cs
+++ b/src/Dax.Vpax.Obfuscator/DaxModelObfuscator.ObfuscateExpression.cs
@@ -1,6 +1,6 @@
 using Dax.Vpax.Obfuscator.Extensions;
 using System.Text;
-using TabularEditor.Dax.Tokenizer;
+using Dax.Tokenizer;
 
 namespace Dax.Vpax.Obfuscator;
 
diff --git a/src/Dax.Vpax.Obfuscator/Extensions/DaxTokenExtensions.cs b/src/Dax.Vpax.Obfuscator/Extensions/DaxTokenExtensions.cs
index ba13156..0377fe2 100644
--- a/src/Dax.Vpax.Obfuscator/Extensions/DaxTokenExtensions.cs
+++ b/src/Dax.Vpax.Obfuscator/Extensions/DaxTokenExtensions.cs
@@ -1,5 +1,5 @@
 using System.Diagnostics;
-using TabularEditor.Dax.Tokenizer;
+using Dax.Tokenizer;
 
 namespace Dax.Vpax.Obfuscator.Extensions;
 
diff --git a/src/TabularEditor.Dax.Tokenizer/README.md b/src/TabularEditor.Dax.Tokenizer/README.md
deleted file mode 100644
index 96f3c25..0000000
--- a/src/TabularEditor.Dax.Tokenizer/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# TabularEditor.Dax.Tokenizer
-
-TODO
diff --git a/tests/Dax.Vpax.Obfuscator.Tests/Dax.Vpax.Obfuscator.Tests.csproj b/tests/Dax.Vpax.Obfuscator.Tests/Dax.Vpax.Obfuscator.Tests.csproj
index 8708d26..cff5166 100644
--- a/tests/Dax.Vpax.Obfuscator.Tests/Dax.Vpax.Obfuscator.Tests.csproj
+++ b/tests/Dax.Vpax.Obfuscator.Tests/Dax.Vpax.Obfuscator.Tests.csproj
@@ -3,7 +3,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\Dax.Vpax.Obfuscator.Common\Dax.Vpax.Obfuscator.Common.csproj" />
     <ProjectReference Include="..\..\src\Dax.Vpax.Obfuscator\Dax.Vpax.Obfuscator.csproj" />
-    <ProjectReference Include="..\..\src\TabularEditor.Dax.Tokenizer\TabularEditor.Dax.Tokenizer.csproj" />
+    <ProjectReference Include="..\..\src\Dax.Tokenizer\Dax.Tokenizer.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/Dax.Vpax.Obfuscator.Tests/DaxModelDeobfuscatorTests.cs b/tests/Dax.Vpax.Obfuscator.Tests/DaxModelDeobfuscatorTests.cs
index 5cc3190..5553e4b 100644
--- a/tests/Dax.Vpax.Obfuscator.Tests/DaxModelDeobfuscatorTests.cs
+++ b/tests/Dax.Vpax.Obfuscator.Tests/DaxModelDeobfuscatorTests.cs
@@ -4,7 +4,7 @@
 using Dax.Metadata;
 using Dax.Vpax.Obfuscator.Common;
 using Dax.Vpax.Obfuscator.Tests.TestUtils;
-using TabularEditor.Dax.Tokenizer;
+using Dax.Tokenizer;
 using Xunit;
 
 namespace Dax.Vpax.Obfuscator.Tests;
diff --git a/tests/Dax.Vpax.Obfuscator.Tests/DaxModelObfuscatorTests.cs b/tests/Dax.Vpax.Obfuscator.Tests/DaxModelObfuscatorTests.cs
index a2dde66..cf39476 100644
--- a/tests/Dax.Vpax.Obfuscator.Tests/DaxModelObfuscatorTests.cs
+++ b/tests/Dax.Vpax.Obfuscator.Tests/DaxModelObfuscatorTests.cs
@@ -1,7 +1,7 @@
 using System.Globalization;
 using Dax.Metadata;
 using Dax.Vpax.Obfuscator.Tests.TestUtils;
-using TabularEditor.Dax.Tokenizer;
+using Dax.Tokenizer;
 using Xunit;
 
 namespace Dax.Vpax.Obfuscator.Tests;