diff --git a/msbuild/Xamarin.Mac.Tasks/Tasks/BTouch.cs b/msbuild/Xamarin.Mac.Tasks/Tasks/BTouch.cs
deleted file mode 100644
index 7fcd6d2100..0000000000
--- a/msbuild/Xamarin.Mac.Tasks/Tasks/BTouch.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Xamarin.MacDev.Tasks;
-
-namespace Xamarin.Mac.Tasks
-{
-	public class BTouch : BTouchTaskBase
-	{
-	}
-}
diff --git a/msbuild/Xamarin.iOS.Tasks/Tasks/BTouch.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/BTouch.cs
similarity index 98%
rename from msbuild/Xamarin.iOS.Tasks/Tasks/BTouch.cs
rename to msbuild/Xamarin.MacDev.Tasks/Tasks/BTouch.cs
index 376275075c..c45252524a 100644
--- a/msbuild/Xamarin.iOS.Tasks/Tasks/BTouch.cs
+++ b/msbuild/Xamarin.MacDev.Tasks/Tasks/BTouch.cs
@@ -8,7 +8,9 @@ using System.IO;
 using Microsoft.Build.Utilities;
 using Xamarin.Messaging;
 
-namespace Xamarin.iOS.Tasks
+using Xamarin.iOS.Tasks;
+
+namespace Xamarin.MacDev.Tasks
 {
 	public class BTouch : BTouchTaskBase, ITaskCallback
 	{
diff --git a/msbuild/Xamarin.iOS.Tasks/Tasks/TaskItemFixer.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/TaskItemFixer.cs
similarity index 100%
rename from msbuild/Xamarin.iOS.Tasks/Tasks/TaskItemFixer.cs
rename to msbuild/Xamarin.MacDev.Tasks/Tasks/TaskItemFixer.cs
diff --git a/msbuild/Xamarin.Shared/Xamarin.Shared.targets b/msbuild/Xamarin.Shared/Xamarin.Shared.targets
index 0423bed299..a9b84b2e1e 100644
--- a/msbuild/Xamarin.Shared/Xamarin.Shared.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.Shared.targets
@@ -34,7 +34,6 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 	<UsingTask TaskName="Microsoft.Build.Tasks.WriteLinesToFile" AssemblyFile="$(_TaskAssemblyName)" />
 
 	<!-- Xamarin.iOS-specific tasks. Some of these are duplicated with the Xamarin.Mac ones below, and should eventually be re-namespaced to be in Xamarin.MacDev -->
-	<UsingTask Condition="'$(_PlatformName)' != 'macOS'" TaskName="Xamarin.iOS.Tasks.BTouch" AssemblyFile="$(_TaskAssemblyName)" />
 	<UsingTask Condition="'$(_PlatformName)' != 'macOS'" TaskName="Xamarin.iOS.Tasks.CodesignVerify" AssemblyFile="$(_TaskAssemblyName)" />
 	<UsingTask Condition="'$(_PlatformName)' != 'macOS'" TaskName="Xamarin.iOS.Tasks.CollectAssetPacks" AssemblyFile="$(_TaskAssemblyName)" />
 	<UsingTask Condition="'$(_PlatformName)' != 'macOS'" TaskName="Xamarin.iOS.Tasks.CollectITunesArtwork" AssemblyFile="$(_TaskAssemblyName)" />
@@ -63,7 +62,6 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 	<UsingTask Condition="'$(_PlatformName)' != 'macOS'" TaskName="Xamarin.iOS.Tasks.WriteAssetPackManifest" AssemblyFile="$(_TaskAssemblyName)" />
 
 	<!-- Xamarin.Mac-specific tasks. Some of these are duplicated with the Xamarin.iOS ones above, and should eventually be re-namespaced to be in Xamarin.MacDev -->
-	<UsingTask Condition="'$(_PlatformName)' == 'macOS'" TaskName="Xamarin.Mac.Tasks.BTouch" AssemblyFile="$(_TaskAssemblyName)" />
 	<UsingTask Condition="'$(_PlatformName)' == 'macOS'" TaskName="Xamarin.Mac.Tasks.CodesignVerify" AssemblyFile="$(_TaskAssemblyName)" />
 	<UsingTask Condition="'$(_PlatformName)' == 'macOS'" TaskName="Xamarin.Mac.Tasks.CompileAppManifest" AssemblyFile="$(_TaskAssemblyName)" />
 	<UsingTask Condition="'$(_PlatformName)' == 'macOS'" TaskName="Xamarin.Mac.Tasks.CompileEntitlements" AssemblyFile="$(_TaskAssemblyName)" />
@@ -81,6 +79,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 	<UsingTask TaskName="Xamarin.MacDev.Tasks.Archive" AssemblyFile="$(_TaskAssemblyName)" />
 	<UsingTask TaskName="Xamarin.MacDev.Tasks.ArTool" AssemblyFile="$(_TaskAssemblyName)" />
 	<UsingTask TaskName="Xamarin.MacDev.Tasks.AOTCompile" AssemblyFile="$(_TaskAssemblyName)" />
+	<UsingTask TaskName="Xamarin.MacDev.Tasks.BTouch" AssemblyFile="$(_TaskAssemblyName)" />
 	<UsingTask TaskName="Xamarin.MacDev.Tasks.Codesign" AssemblyFile="$(_TaskAssemblyName)" />
 	<UsingTask TaskName="Xamarin.MacDev.Tasks.CollectBundleResources" AssemblyFile="$(_TaskAssemblyName)" />
 	<UsingTask TaskName="Xamarin.MacDev.Tasks.CollectFrameworks" AssemblyFile="$(_TaskAssemblyName)" />
diff --git a/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/BTouchTaskTest.cs b/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/BTouchTaskTest.cs
index 71ca93cb1d..b702ccf655 100644
--- a/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/BTouchTaskTest.cs
+++ b/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/BTouchTaskTest.cs
@@ -5,7 +5,9 @@ using Microsoft.Build.Utilities;
 
 using NUnit.Framework;
 
-namespace Xamarin.iOS.Tasks
+using Xamarin.iOS.Tasks;
+
+namespace Xamarin.MacDev.Tasks
 {
 	class CustomBTouchTask : BTouch
 	{