diff --git a/Publish.ps1 b/Publish.ps1
index 7646e36..9df3197 100644
--- a/Publish.ps1
+++ b/Publish.ps1
@@ -15,7 +15,7 @@ function push
   param([string]$project)
 
   Write-Host "Pushing $($project).csproj" -Foreground Blue
-  NuGet.exe push "publish\X2Software.$($project).$($version.NuGetVersion).nupkg" -apikey "$($nugetkey)" -Source https://www.nuget.org/api/v2/package
+  NuGet.exe push "publish\$($project).$($version.NuGetVersion).nupkg" -apikey "$($nugetkey)" -Source https://www.nuget.org/api/v2/package
 }
 
 
diff --git a/Tapeti.Annotations/Tapeti.Annotations.nuspec b/Tapeti.Annotations/Tapeti.Annotations.nuspec
index acceaf2..46f5364 100644
--- a/Tapeti.Annotations/Tapeti.Annotations.nuspec
+++ b/Tapeti.Annotations/Tapeti.Annotations.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package >
   <metadata>
-    <id>X2Software.Tapeti.Annotations</id>
+    <id>Tapeti.Annotations</id>
     <version>$version$</version>
     <title>$title$</title>
     <authors>Mark van Renswoude</authors>
diff --git a/Tapeti.DataAnnotations/Tapeti.DataAnnotations.nuspec b/Tapeti.DataAnnotations/Tapeti.DataAnnotations.nuspec
index a1b9042..f9c9979 100644
--- a/Tapeti.DataAnnotations/Tapeti.DataAnnotations.nuspec
+++ b/Tapeti.DataAnnotations/Tapeti.DataAnnotations.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package >
   <metadata>
-    <id>X2Software.Tapeti.DataAnnotations</id>
+    <id>Tapeti.DataAnnotations</id>
     <version>$version$</version>
     <title>$title$</title>
     <authors>Mark van Renswoude</authors>
@@ -14,7 +14,7 @@
     <copyright></copyright>
     <tags>rabbitmq tapeti dataannotations</tags>
     <dependencies>
-      <dependency id="X2Software.Tapeti" version="[$depversion$]" />
+      <dependency id="Tapeti" version="[$depversion$]" />
     </dependencies>
   </metadata>
 </package>
\ No newline at end of file
diff --git a/Tapeti.Flow.SQL/Tapeti.Flow.SQL.nuspec b/Tapeti.Flow.SQL/Tapeti.Flow.SQL.nuspec
index 686bbf9..2b5fc06 100644
--- a/Tapeti.Flow.SQL/Tapeti.Flow.SQL.nuspec
+++ b/Tapeti.Flow.SQL/Tapeti.Flow.SQL.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package >
   <metadata>
-    <id>X2Software.Tapeti.Flow.SQL</id>
+    <id>Tapeti.Flow.SQL</id>
     <version>$version$</version>
     <title>$title$</title>
     <authors>Mark van Renswoude</authors>
@@ -14,8 +14,8 @@
     <copyright></copyright>
     <tags>rabbitmq tapeti sql</tags>
     <dependencies>
-      <dependency id="X2Software.Tapeti" version="[$depversion$]" />
-      <dependency id="X2Software.Tapeti.Flow" version="[$depversion$]" />
+      <dependency id="Tapeti" version="[$depversion$]" />
+      <dependency id="Tapeti.Flow" version="[$depversion$]" />
     </dependencies>
   </metadata>
 </package>
\ No newline at end of file
diff --git a/Tapeti.Flow/Tapeti.Flow.nuspec b/Tapeti.Flow/Tapeti.Flow.nuspec
index 1df4677..e31106a 100644
--- a/Tapeti.Flow/Tapeti.Flow.nuspec
+++ b/Tapeti.Flow/Tapeti.Flow.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package >
   <metadata>
-    <id>X2Software.Tapeti.Flow</id>
+    <id>Tapeti.Flow</id>
     <version>$version$</version>
     <title>$title$</title>
     <authors>Menno van Lavieren, Mark van Renswoude</authors>
@@ -14,8 +14,8 @@
     <copyright></copyright>
     <tags>rabbitmq tapeti flow</tags>
     <dependencies>
-      <dependency id="X2Software.Tapeti" version="[$depversion$]" />
-      <dependency id="X2Software.Tapeti.Annotations" version="[$depversion$]" />
+      <dependency id="Tapeti" version="[$depversion$]" />
+      <dependency id="Tapeti.Annotations" version="[$depversion$]" />
     </dependencies>
   </metadata>
 </package>
\ No newline at end of file
diff --git a/Tapeti.SimpleInjector/Tapeti.SimpleInjector.nuspec b/Tapeti.SimpleInjector/Tapeti.SimpleInjector.nuspec
index 6af6063..1782317 100644
--- a/Tapeti.SimpleInjector/Tapeti.SimpleInjector.nuspec
+++ b/Tapeti.SimpleInjector/Tapeti.SimpleInjector.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package >
   <metadata>
-    <id>X2Software.Tapeti.SimpleInjector</id>
+    <id>Tapeti.SimpleInjector</id>
     <version>$version$</version>
     <title>$title$</title>
     <authors>Mark van Renswoude</authors>
@@ -14,7 +14,7 @@
     <copyright></copyright>
     <tags>rabbitmq tapeti simpleinjector</tags>
     <dependencies>
-      <dependency id="X2Software.Tapeti" version="[$depversion$]" />
+      <dependency id="Tapeti" version="[$depversion$]" />
     </dependencies>
   </metadata>
 </package>
\ No newline at end of file
diff --git a/Tapeti/Tapeti.nuspec b/Tapeti/Tapeti.nuspec
index 249c4c2..07055cb 100644
--- a/Tapeti/Tapeti.nuspec
+++ b/Tapeti/Tapeti.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package >
   <metadata>
-    <id>X2Software.Tapeti</id>
+    <id>Tapeti</id>
     <version>$version$</version>
     <title>$title$</title>
     <authors>Mark van Renswoude</authors>
@@ -14,7 +14,7 @@
     <copyright></copyright>
     <tags>rabbitmq tapeti</tags>
     <dependencies>
-      <dependency id="X2Software.Tapeti.Annotations" version="[$depversion$]" />
+      <dependency id="Tapeti.Annotations" version="[$depversion$]" />
     </dependencies>
   </metadata>
 </package>
\ No newline at end of file