diff --git a/tools/mmp/driver.cs b/tools/mmp/driver.cs
index 842fe95d28..13d5b360ca 100644
--- a/tools/mmp/driver.cs
+++ b/tools/mmp/driver.cs
@@ -358,8 +358,8 @@ namespace Xamarin.Bundler {
 					true /* this is an internal option */
 				},
 				{ "xamarin-framework-directory=", "The framework directory", v => { xm_framework_dir = v; }, true },
-				{ "xamarin-full-framework", "Used with --target-framework=4.5 to select XM 4.5 Target Framework", v => { IsUnifiedFullXamMacFramework = true; } },
-				{ "xamarin-system-framework", "Used with --target-framework=4.5 to select XM 4.5 Target Framework", v => { IsUnifiedFullSystemFramework = true; } },
+				{ "xamarin-full-framework", "Used with --target-framework=4.5 to select XM Full Target Framework", v => { IsUnifiedFullXamMacFramework = true; } },
+				{ "xamarin-system-framework", "Used with --target-framework=4.5 to select XM Full Target Framework", v => { IsUnifiedFullSystemFramework = true; } },
 				{ "aot:", "Specify assemblies that should be experimentally AOT compiled\n- none - No AOT (default)\n- all - Every assembly in MonoBundle\n- core - Xamarin.Mac, System, mscorlib\n- sdk - Xamarin.Mac.dll and BCL assemblies\n- |hybrid after option enables hybrid AOT which allows IL stripping but is slower\n - Individual files can be included for AOT via +FileName.dll and excluded via -FileName.dll\n\nExamples:\n  --aot:all,-MyAssembly.dll\n  --aot:core|hybird,+MyOtherAssembly.dll,-mscorlib.dll",
 					v => {
 						aotOptions = new AOTOptions (v);
@@ -1175,7 +1175,7 @@ namespace Xamarin.Bundler {
 				break;
 			case "x86_64":
 				if (IsClassic)
-					throw new MonoMacException (5204, true, "Invalid architecture. x86_64 is only supported with the mobile profile.");
+					throw new MonoMacException (5204, true, "Invalid architecture. x86_64 is only supported on non-Classic profiles.");
 				break;
 			default:
 				throw new MonoMacException (5205, true, "Invalid architecture '{0}'. Valid architectures are i386 and x86_64 (when --profile=mobile).", arch);
diff --git a/tools/mmp/error.cs b/tools/mmp/error.cs
index a4c567fc3b..2da98d93d7 100644
--- a/tools/mmp/error.cs
+++ b/tools/mmp/error.cs
@@ -99,7 +99,7 @@ namespace Xamarin.Bundler {
 	//			MM52xx	linking
 	//					MM5202	Mono.framework MDK is missing. Please install the MDK for your Mono.framework version from http://mono-project.com/Downloads
 	//					MM5203  Can't find libxammac.a, likely because of a corrupted Xamarin.Mac installation. Please reinstall Xamarin.Mac.
-	//					MM5204  Invalid architecture. x86_64 is only supported with the mobile profile.
+//						MM5204  Invalid architecture. x86_64 is only supported on non-Classic profiles.
 	//					MM5205  Invalid architecture '{0}'. Valid architectures are i386 and x86_64 (when --profile=mobile).
 	//					MM5206	** reserved mtouch **
 	//					MM5207	** reserved mtouch **