diff --git a/Make.config b/Make.config
index ff7a4d753f..bc9f8db11f 100644
--- a/Make.config
+++ b/Make.config
@@ -270,13 +270,13 @@ MAC_PACKAGE_DMG_DIRNAME="$(MAC_PACKAGE_TITLE)"
 MAC_PACKAGE_UTI=com.$(MAC_PACKAGE_NAME_LOWER).pkg
 MAC_PACKAGE_INSTALL_LOCATION=$(MAC_FRAMEWORK_VERSIONED_DIR)
 
-TT = $(SYSTEM_MONO) "/Applications/Xamarin Studio.app/Contents/Resources/lib/monodevelop/AddIns/MonoDevelop.TextTemplating/TextTransform.exe"
+TT = $(SYSTEM_MONO) "/Applications/Visual Studio.app/Contents/Resources/lib/monodevelop/AddIns/MonoDevelop.TextTemplating/TextTransform.exe"
 
 PRODUCT_KEY_PATH?=$(TOP)/product.snk
 
 include $(TOP)/mk/quiet.mk
 
-MDTOOL?=DYLD_FALLBACK_LIBRARY_PATH=$(HOME)/lib:/usr/local/lib:/lib:/usr/lib:/Library/Frameworks/Mono.framework/Versions/Current/lib $(SYSTEM_MONO) "/Applications/Xamarin Studio.app/Contents/Resources/lib/monodevelop/bin/mdtool.exe" $(MDTOOL_VERBOSITY)
+MDTOOL?="/Applications/Visual Studio.app/Contents/MacOS/vstool" $(MDTOOL_VERBOSITY)
 
 ifneq ($(BUILD_REVISION),)
 # wrench build only
diff --git a/src/NativeTypes/Makefile b/src/NativeTypes/Makefile
index efb150cd33..f0192c7098 100644
--- a/src/NativeTypes/Makefile
+++ b/src/NativeTypes/Makefile
@@ -1,4 +1,4 @@
-TT = "/Applications/Xamarin Studio.app/Contents/MacOS/lib/monodevelop/AddIns/MonoDevelop.TextTemplating/TextTransform.exe"
+TT = "/Applications/Visual Studio.app/Contents/MacOS/lib/monodevelop/AddIns/MonoDevelop.TextTemplating/TextTransform.exe"
 
 .PHONY: all test clean
 
diff --git a/tests/common/Configuration.cs b/tests/common/Configuration.cs
index 00a66edede..73d3fe4071 100644
--- a/tests/common/Configuration.cs
+++ b/tests/common/Configuration.cs
@@ -11,7 +11,7 @@ namespace Xamarin.Tests
 		public const string XI_ProductName = "MonoTouch";
 		public const string XM_ProductName = "Xamarin.Mac";
 
-		const string XS_PATH = "/Applications/Xamarin Studio.app/Contents/Resources";
+		const string XS_PATH = "/Applications/Visual Studio.app/Contents/Resources";
 
 		static string mt_root;
 		static string ios_destdir;
diff --git a/tests/common/mac/ProjectTestHelpers.cs b/tests/common/mac/ProjectTestHelpers.cs
index 1de4c44263..b9f07ba244 100644
--- a/tests/common/mac/ProjectTestHelpers.cs
+++ b/tests/common/mac/ProjectTestHelpers.cs
@@ -136,7 +136,7 @@ namespace Xamarin.MMP.Tests
 			if (isUnified)
 				return RunAndAssert ("/Library/Frameworks/Mono.framework/Commands/" + (useMSBuild ? "msbuild" : "xbuild"), buildArgs, "Compile", shouldFail, getBuildProjectErrorInfo);
 			else
-				return RunAndAssert ("/Applications/Xamarin Studio.app/Contents/MacOS/mdtool", buildArgs, "Compile", shouldFail, getBuildProjectErrorInfo);
+				return RunAndAssert ("/Applications/Visual Studio.app/Contents/MacOS/vstool", buildArgs, "Compile", shouldFail, getBuildProjectErrorInfo);
 		}
 
 		static string ProjectTextReplacement (UnifiedTestConfig config, string text)
diff --git a/tests/mmptest/src/ClassicTests.cs b/tests/mmptest/src/ClassicTests.cs
index 55343f8ab4..06ec413b6d 100644
--- a/tests/mmptest/src/ClassicTests.cs
+++ b/tests/mmptest/src/ClassicTests.cs
@@ -15,7 +15,7 @@ namespace Xamarin.MMP.Tests
 		{
 			get
 			{
-				return TI.FindMonoVersion () < new Version ("4.3") || !PlatformHelpers.CheckSystemVersion (10, 10); // mdtool build requires us to be on a version that XS supports
+				return TI.FindMonoVersion () < new Version ("4.3") || !PlatformHelpers.CheckSystemVersion (10, 10); // vstool build requires us to be on a version that XS supports
 			}
 		}
 
diff --git a/tests/xharness/Jenkins.cs b/tests/xharness/Jenkins.cs
index 8f03bc86c9..13a4a51cd8 100644
--- a/tests/xharness/Jenkins.cs
+++ b/tests/xharness/Jenkins.cs
@@ -1954,7 +1954,7 @@ function oninitialload ()
 			ExecutionResult = TestExecutingResult.Building;
 			using (var resource = await NotifyBlockingWaitAsync (Jenkins.DesktopResource.AcquireConcurrentAsync ())) {
 				using (var xbuild = new Process ()) {
-					xbuild.StartInfo.FileName = "/Applications/Xamarin Studio.app/Contents/MacOS/mdtool";
+					xbuild.StartInfo.FileName = "/Applications/Visual Studio.app/Contents/MacOS/vstool";
 					var args = new StringBuilder ();
 					args.Append ("build ");
 					var sln = Path.ChangeExtension (ProjectFile, "sln");
diff --git a/tests/xharness/MakefileGenerator.cs b/tests/xharness/MakefileGenerator.cs
index 1b86bd4879..b2009170df 100644
--- a/tests/xharness/MakefileGenerator.cs
+++ b/tests/xharness/MakefileGenerator.cs
@@ -120,7 +120,7 @@ namespace xharness
 						allTargetNames.Add (MakeMacClassicTargetName (target, MacTargetNameType.Build));
 						allTargetCleanNames.Add (MakeMacClassicTargetName (target, MacTargetNameType.Clean));
 
-						// mdtool can only find referenced projects if the referenced
+						// vstool can only find referenced projects if the referenced
 						// projects are included in the solution. This requires us to
 						// build the solution (if it exists), not the project.
 						var slnPath = Path.ChangeExtension (target.ProjectPath, "sln");
diff --git a/tools/mtouch/mtouch.cs b/tools/mtouch/mtouch.cs
index 41b4bc2024..d58d6dea14 100644
--- a/tools/mtouch/mtouch.cs
+++ b/tools/mtouch/mtouch.cs
@@ -1464,11 +1464,6 @@ namespace Xamarin.Bundler
 				if (File.Exists (path))
 					return path;
 
-				// check inside XS
-				path = "/Applications/Xamarin Studio.app/Contents/Resources/lib/monodevelop/AddIns/MonoDevelop.IPhone/mlaunch.app/Contents/MacOS/mlaunch";
-				if (File.Exists (path))
-					return path;
-
 				// check an environment variable
 				path = Environment.GetEnvironmentVariable ("MLAUNCH_PATH");
 				if (File.Exists (path))