diff --git a/msbuild/Xamarin.Mac.Tasks.Core/Tasks/DetectSdkLocations.cs b/msbuild/Xamarin.Mac.Tasks.Core/Tasks/DetectSdkLocationsTaskBase.cs
similarity index 100%
rename from msbuild/Xamarin.Mac.Tasks.Core/Tasks/DetectSdkLocations.cs
rename to msbuild/Xamarin.Mac.Tasks.Core/Tasks/DetectSdkLocationsTaskBase.cs
diff --git a/msbuild/Xamarin.Mac.Tasks.Core/Tasks/EmbedProvisionProfile.cs b/msbuild/Xamarin.Mac.Tasks.Core/Tasks/EmbedProvisionProfileTaskBase.cs
similarity index 100%
rename from msbuild/Xamarin.Mac.Tasks.Core/Tasks/EmbedProvisionProfile.cs
rename to msbuild/Xamarin.Mac.Tasks.Core/Tasks/EmbedProvisionProfileTaskBase.cs
diff --git a/msbuild/Xamarin.Mac.Tasks.Core/Tasks/Mmp.cs b/msbuild/Xamarin.Mac.Tasks.Core/Tasks/MmpTaskBase.cs
similarity index 100%
rename from msbuild/Xamarin.Mac.Tasks.Core/Tasks/Mmp.cs
rename to msbuild/Xamarin.Mac.Tasks.Core/Tasks/MmpTaskBase.cs
diff --git a/msbuild/Xamarin.Mac.Tasks.Core/Xamarin.Mac.Tasks.Core.csproj b/msbuild/Xamarin.Mac.Tasks.Core/Xamarin.Mac.Tasks.Core.csproj
index 08856b7b56..8e981f271e 100644
--- a/msbuild/Xamarin.Mac.Tasks.Core/Xamarin.Mac.Tasks.Core.csproj
+++ b/msbuild/Xamarin.Mac.Tasks.Core/Xamarin.Mac.Tasks.Core.csproj
@@ -33,9 +33,9 @@
-
-
-
+
+
+
diff --git a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Tasks.csproj b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Tasks.csproj
index 05a51fc5a2..f5a6274541 100644
--- a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Tasks.csproj
+++ b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Tasks.csproj
@@ -60,9 +60,9 @@
{CC3D9353-20C4-467A-8522-A9DED6F0C753}
Xamarin.MacDev
-
- {93e12fa0-089c-4bc8-840f-43cfbc7927c7}
- Xamarin.iOS.Tasks.Core
+
+ {af1ac7c3-f6dd-4e46-b897-9dbb90b158ec}
+ Xamarin.Mac.Tasks.Core
{534D7C5A-0E1C-4C58-9E48-21B1A98919EB}