diff --git a/GameData/MOARdV/Patches/000_JSI-To-MAS.cfg b/GameData/MOARdV/Patches/000_JSI-To-MAS.cfg
index ec8540c5..41befa11 100644
--- a/GameData/MOARdV/Patches/000_JSI-To-MAS.cfg
+++ b/GameData/MOARdV/Patches/000_JSI-To-MAS.cfg
@@ -1,6 +1,7 @@
 // The MAS support piggyback patch.  Adds a generic MAS module to any part that
-// includes an RPM module.
-@PART[*]:HAS[@MODULE[RasterPropMonitorComputer]&!MODULE[MASFlightComputer]]:FINAL	// Should run very late, to leave room for anything else to patch RPM first
+// includes an RPM module
+// Should run very late, to leave room for anything else to patch RPM first. Run 1st in Final pass, before ASET-To-MAS, MAS-to-MAS & MAS_SCANsat patches
+@PART[*]:HAS[@MODULE[RasterPropMonitorComputer]&!MODULE[MASFlightComputer]]:FINAL
 {
 	MODULE
 	{
@@ -23,7 +24,7 @@
 	}
 }
 
-@PART[JSIPrimitiveExternalCamera]:LAST[zzz_AvionicsSystems]
+@PART[JSIPrimitiveExternalCamera]:FOR[AvionicsSystems]
 {
 	MODULE
 	{
@@ -44,7 +45,7 @@
 
 // The JSI to MAS prop upgrade patch.  This Module Manager patch replaces
 // every core RPM-enabled prop with its equivalent MAS-enabled prop.
-@INTERNAL[*]:FINAL		// Should run very late, to leave room for every IVA mod/patch to run first?
+@INTERNAL[*]:FINAL		// Run 1st in Final pass, before ASET-to-MAS patch, MAS-to-MAS patch, and MAS_SCANsat patch
 {
 	// ---=== JSI/RasterPropMonitor Props ===--- //
 
diff --git a/GameData/MOARdV/Patches/001_ASET-To-MAS.nocfg b/GameData/MOARdV/Patches/001_ASET-To-MAS.nocfg
index 079fcb48..b0913dbd 100644
--- a/GameData/MOARdV/Patches/001_ASET-To-MAS.nocfg
+++ b/GameData/MOARdV/Patches/001_ASET-To-MAS.nocfg
@@ -1,7 +1,8 @@
 // The ASET to MAS prop upgrade patch.  This Module Manager patch replaces
 // every ASET Avionics and ASET Props RPM-enabled prop with its equivalent
 // MAS-enabled prop. Should run very late, to leave room for every IVA mod/patch to run first?
-@INTERNAL[*]:FINAL		//<---On patch order: what happens if another mod, patches/edits/clones a prop, and MAS applies this after?
+// Run 2nd in Final pass, after JSI-to-MAS patch, but before MAS-to-MAS & MAS_SCANsat patches
+@INTERNAL[*]:FINAL
 {
 	// TODOs found in the ALCOR IVA that may or may not be supported already.
 
diff --git a/GameData/MOARdV/Patches/MAS_Old-To-MAS_New.cfg b/GameData/MOARdV/Patches/002_MAS_Old-To-MAS_New.cfg
similarity index 95%
rename from GameData/MOARdV/Patches/MAS_Old-To-MAS_New.cfg
rename to GameData/MOARdV/Patches/002_MAS_Old-To-MAS_New.cfg
index 95ee56ca..cde9473e 100644
--- a/GameData/MOARdV/Patches/MAS_Old-To-MAS_New.cfg
+++ b/GameData/MOARdV/Patches/002_MAS_Old-To-MAS_New.cfg
@@ -1,7 +1,8 @@
 // The MAS to MAS prop conversion patch.  This Module Manager patch replaces
 // old MAS prop names with the updated nomenclature, so the handful of old
 // IVAs don't have to be rebuilt.
-@INTERNAL[*]:LAST[AvionicsSystems]
+// Run 3rd in Final pass, after JSI-to-MAS & ASET-to-MAS patches, but before MAS_SCANsat patch
+@INTERNAL[*]:FINAL
 {
 	// IndicatorPanel5x3
 	@PROP[MAS_IP5x3_Alarm],*
diff --git a/GameData/MOARdV/Patches/001_MAS_SCANsat.cfg b/GameData/MOARdV/Patches/003_MAS_SCANsat.cfg
similarity index 53%
rename from GameData/MOARdV/Patches/001_MAS_SCANsat.cfg
rename to GameData/MOARdV/Patches/003_MAS_SCANsat.cfg
index 61117c95..62f1b8c1 100644
--- a/GameData/MOARdV/Patches/001_MAS_SCANsat.cfg
+++ b/GameData/MOARdV/Patches/003_MAS_SCANsat.cfg
@@ -1,7 +1,8 @@
 // Because the RPM bridge for SCANsat uses a local persistent storage module,
 // but the SCANsat MM patch only applies to RasterPropMonitor, we need our own
 // patch here to get the persistent storage module added to our parts.
-@PART[*]:HAS[@MODULE[MASFlightComputer&!MODULE[SCANRPMStorage]]:NEEDS[SCANsat]:FINAL		// Should run very late, after JSI-to-MAS patch, due to MASFlightComputer
+// Should run very late, after JSI-to-MAS patch, due to MASFlightComputer. Run last in Final pass, after JSI-to-MAS, ASET-to-MAS, MAS-to-MAS patches
+@PART[*]:HAS[@MODULE[MASFlightComputer]&!MODULE[SCANRPMStorage]]:NEEDS[SCANsat]:FINAL
 {
 	MODULE
 	{
diff --git a/GameData/MOARdV/Patches/MAS_AJE_IdEngine.cfg b/GameData/MOARdV/Patches/MAS_AJE_IdEngine.cfg
index 257cc3ed..6d68e7ae 100644
--- a/GameData/MOARdV/Patches/MAS_AJE_IdEngine.cfg
+++ b/GameData/MOARdV/Patches/MAS_AJE_IdEngine.cfg
@@ -1,6 +1,6 @@
 // Add MASIdEngine to supported part modules.
 
-@PART[*]:HAS[@MODULE[ModuleEnginesAJEPropeller&!MODULE[MASIdEngine]]:AFTER[AJE]
+@PART[*]:HAS[@MODULE[ModuleEnginesAJEPropeller]&!MODULE[MASIdEngine]]:AFTER[AJE]
 {
 	MODULE
 	{
@@ -8,7 +8,7 @@
 	}
 }
 
-@PART[*]:HAS[@MODULE[ModuleEnginesAJEJet]&!MODULE[MASIdEngine]]]:AFTER[AJE]
+@PART[*]:HAS[@MODULE[ModuleEnginesAJEJet]&!MODULE[MASIdEngine]]:AFTER[AJE]
 {
 	MODULE
 	{
diff --git a/GameData/MOARdV/Patches/MAS_ALCOR.cfg b/GameData/MOARdV/Patches/MAS_ALCOR_Orig.cfg
similarity index 100%
rename from GameData/MOARdV/Patches/MAS_ALCOR.cfg
rename to GameData/MOARdV/Patches/MAS_ALCOR_Orig.cfg