diff --git a/Source/Libs/AtkSharp/AtkSharp.csproj b/Source/Libs/AtkSharp/AtkSharp.csproj
index 825b043fb..e4f24eab3 100755
--- a/Source/Libs/AtkSharp/AtkSharp.csproj
+++ b/Source/Libs/AtkSharp/AtkSharp.csproj
@@ -3,8 +3,8 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <PackageProjectUrl>https://github.com/cra0zy/GtkSharp</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/cra0zy/GtkSharp</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/GtkSharp/GtkSharp</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/GtkSharp/GtkSharp</RepositoryUrl>
     <Description>AtkSharp is a C# wrapper for the Atk library.</Description>
     <PackageTags>atk;atksharp;atk-sharp;wrapper</PackageTags>
   </PropertyGroup>
diff --git a/Source/Libs/CairoSharp/CairoSharp.csproj b/Source/Libs/CairoSharp/CairoSharp.csproj
index afb180d94..c77367612 100755
--- a/Source/Libs/CairoSharp/CairoSharp.csproj
+++ b/Source/Libs/CairoSharp/CairoSharp.csproj
@@ -3,8 +3,8 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <PackageProjectUrl>https://github.com/cra0zy/GtkSharp</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/cra0zy/GtkSharp</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/GtkSharp/GtkSharp</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/GtkSharp/GtkSharp</RepositoryUrl>
     <Description>CairoSharp is a C# wrapper for the Cairo library.</Description>
     <PackageTags>cairo;cairosharp;cairo-sharp;wrapper</PackageTags>
   </PropertyGroup>
diff --git a/Source/Libs/GLibSharp/GLibSharp.csproj b/Source/Libs/GLibSharp/GLibSharp.csproj
index ee3904c60..e2767e053 100755
--- a/Source/Libs/GLibSharp/GLibSharp.csproj
+++ b/Source/Libs/GLibSharp/GLibSharp.csproj
@@ -3,8 +3,8 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <PackageProjectUrl>https://github.com/cra0zy/GtkSharp</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/cra0zy/GtkSharp</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/GtkSharp/GtkSharp</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/GtkSharp/GtkSharp</RepositoryUrl>
     <Description>GLibSharp is a C# wrapper for the GLib library.</Description>
     <PackageTags>glib;glibsharp;glib-sharp;wrapper</PackageTags>
   </PropertyGroup>
diff --git a/Source/Libs/GdkSharp/GdkSharp.csproj b/Source/Libs/GdkSharp/GdkSharp.csproj
index 9cdc888c6..7c916a8c5 100755
--- a/Source/Libs/GdkSharp/GdkSharp.csproj
+++ b/Source/Libs/GdkSharp/GdkSharp.csproj
@@ -3,8 +3,8 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <PackageProjectUrl>https://github.com/cra0zy/GtkSharp</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/cra0zy/GtkSharp</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/GtkSharp/GtkSharp</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/GtkSharp/GtkSharp</RepositoryUrl>
     <Description>GdkSharp is a C# wrapper for the Gdk library.</Description>
     <PackageTags>gdk;gdksharp;gdk-sharp;wrapper</PackageTags>
   </PropertyGroup>
diff --git a/Source/Libs/GioSharp/GioSharp.csproj b/Source/Libs/GioSharp/GioSharp.csproj
index ca1b39a0f..1757be2d3 100755
--- a/Source/Libs/GioSharp/GioSharp.csproj
+++ b/Source/Libs/GioSharp/GioSharp.csproj
@@ -3,8 +3,8 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <PackageProjectUrl>https://github.com/cra0zy/GtkSharp</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/cra0zy/GtkSharp</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/GtkSharp/GtkSharp</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/GtkSharp/GtkSharp</RepositoryUrl>
     <Description>GioSharp is a C# wrapper for the Gio library.</Description>
     <PackageTags>gio;giosharp;gio-sharp;wrapper</PackageTags>
   </PropertyGroup>
diff --git a/Source/Libs/GtkSharp/GtkSharp.csproj b/Source/Libs/GtkSharp/GtkSharp.csproj
index ac48af52b..90a0f9e3e 100755
--- a/Source/Libs/GtkSharp/GtkSharp.csproj
+++ b/Source/Libs/GtkSharp/GtkSharp.csproj
@@ -4,9 +4,9 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <PackageIconUrl>https://raw.githubusercontent.com/cra0zy/GtkSharp/develop/Source/Libs/GtkSharp/Icon.png</PackageIconUrl>
-    <PackageProjectUrl>https://github.com/cra0zy/GtkSharp</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/cra0zy/GtkSharp</RepositoryUrl>
+    <PackageIconUrl>https://raw.githubusercontent.com/GtkSharp/GtkSharp/develop/Source/Libs/GtkSharp/Icon.png</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/GtkSharp/GtkSharp</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/GtkSharp/GtkSharp</RepositoryUrl>
     <Description>GtkSharp is a C# wrapper for the Gtk library.</Description>
     <PackageTags>gtk;gtksharp;gtk-sharp;wrapper</PackageTags>
   </PropertyGroup>
diff --git a/Source/Libs/PangoSharp/PangoSharp.csproj b/Source/Libs/PangoSharp/PangoSharp.csproj
index f9a41758a..f158bf172 100755
--- a/Source/Libs/PangoSharp/PangoSharp.csproj
+++ b/Source/Libs/PangoSharp/PangoSharp.csproj
@@ -3,8 +3,8 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <PackageProjectUrl>https://github.com/cra0zy/GtkSharp</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/cra0zy/GtkSharp</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/GtkSharp/GtkSharp</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/GtkSharp/GtkSharp</RepositoryUrl>
     <Description>PangoSharp is a C# wrapper for the Pango library.</Description>
     <PackageTags>pango;pangosharp;pango-sharp;wrapper</PackageTags>
   </PropertyGroup>
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/GtkSharp.Template.CSharp.nuspec b/Source/Templates/NetCore/GtkSharp.Template.CSharp/GtkSharp.Template.CSharp.nuspec
index 36d189b8c..3b960f935 100755
--- a/Source/Templates/NetCore/GtkSharp.Template.CSharp/GtkSharp.Template.CSharp.nuspec
+++ b/Source/Templates/NetCore/GtkSharp.Template.CSharp/GtkSharp.Template.CSharp.nuspec
@@ -8,7 +8,7 @@
     <description>A simple C# template for your .Net Core Gtk Application.</description>
     <authors>GtkSharp Contributors</authors>
     <owners>GtkSharp Contributors</owners>
-    <projectUrl>https://github.com/cra0zy/GtkSharp</projectUrl>
+    <projectUrl>https://github.com/GtkSharp/GtkSharp</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <releaseNotes></releaseNotes>
     <tags>gtk gtksharp gtk-sharp app dotnet new template</tags>
diff --git a/build.cake b/build.cake
index 7ea9c295b..548f5e1f4 100755
--- a/build.cake
+++ b/build.cake
@@ -21,7 +21,7 @@ Task("Init")
     // Assign some common properties
     msbuildsettings = msbuildsettings.WithProperty("Version", Settings.Version);
     msbuildsettings = msbuildsettings.WithProperty("Authors", "'GtkSharp Contributors'");
-    msbuildsettings = msbuildsettings.WithProperty("PackageLicenseUrl", "'https://github.com/cra0zy/GtkSharp/blob/cakecore/LICENSE'");
+    msbuildsettings = msbuildsettings.WithProperty("PackageLicenseUrl", "'https://github.com/GtkSharp/GtkSharp/blob/cakecore/LICENSE'");
 
     // Add stuff to list
     Settings.Init();