diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index 742283431..4a4234667 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -35,10 +35,10 @@ Emulators\duckstation\duckstation-nogui-x64-ReleaseLTCG.exe
 Emulators\duckstation\duckstation-qt-x64-ReleaseLTCG.exe
 Emulators\flycast\flycast.exe
 Emulators\Hypseus Singe\hypseus.exe
+Emulators\m2emulator\EMULATOR.EXE
 Emulators\mame\mame.exe
 Emulators\melonDS\melonDS.exe
 Emulators\mGBA\mGBA.exe
-Emulators\Model2\EMULATOR.EXE
 Emulators\mupen64plus\mupen64plus-ui-console.exe
 Emulators\Oricutron\oricutron.exe
 Emulators\PCSX2\pcsx2.exe
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index 4343b4de9..b3b63d506 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -177,6 +177,17 @@
             <entry>%ESPATH%\..\Hypseus Singe\hypseus.exe</entry>
         </rule>
     </emulator>
+    <emulator name="M2EMULATOR">
+        <!-- Sega Model 2 Emulator -->
+        <rule type="systempath">
+            <entry>EMULATOR.EXE</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\m2emulator\EMULATOR.EXE</entry>
+            <entry>%ESPATH%\m2emulator\EMULATOR.EXE</entry>
+            <entry>%ESPATH%\..\m2emulator\EMULATOR.EXE</entry>
+        </rule>
+    </emulator>
     <emulator name="MAME">
         <!-- Arcade emulator MAME -->
         <rule type="systempath">
@@ -215,17 +226,6 @@
             <entry>%ESPATH%\..\mGBA\mGBA.exe</entry>
         </rule>
     </emulator>
-    <emulator name="MODEL2">
-        <!-- Sega Model 2 Emulator -->
-        <rule type="systempath">
-            <entry>EMULATOR.EXE</entry>
-        </rule>
-        <rule type="staticpath">
-            <entry>%ESPATH%\Emulators\Model2\EMULATOR.EXE</entry>
-            <entry>%ESPATH%\Model2\EMULATOR.EXE</entry>
-            <entry>%ESPATH%\..\Model2\EMULATOR.EXE</entry>
-        </rule>
-    </emulator>
     <emulator name="MUPEN64PLUS">
         <!-- Nintendo 64 emulator Mupen64Plus -->
         <rule type="systempath">
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index c4f22d7c4..27105cd51 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -117,6 +117,14 @@
             <entry>%ESPATH%\..\Hypseus Singe\hypseus.exe</entry>
         </rule>
     </emulator>
+    <emulator name="M2EMULATOR">
+        <!-- Sega Model 2 Emulator -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\m2emulator\EMULATOR.EXE</entry>
+            <entry>%ESPATH%\m2emulator\EMULATOR.EXE</entry>
+            <entry>%ESPATH%\..\m2emulator\EMULATOR.EXE</entry>
+        </rule>
+    </emulator>
     <emulator name="MAME">
         <!-- Arcade emulator MAME -->
         <rule type="staticpath">
@@ -141,14 +149,6 @@
             <entry>%ESPATH%\..\mGBA\mGBA.exe</entry>
         </rule>
     </emulator>
-    <emulator name="MODEL2">
-        <!-- Sega Model 2 Emulator -->
-        <rule type="staticpath">
-            <entry>%ESPATH%\Emulators\Model2\EMULATOR.EXE</entry>
-            <entry>%ESPATH%\Model2\EMULATOR.EXE</entry>
-            <entry>%ESPATH%\..\Model2\EMULATOR.EXE</entry>
-        </rule>
-    </emulator>
     <emulator name="MUPEN64PLUS">
         <!-- Nintendo 64 emulator Mupen64Plus -->
         <rule type="staticpath">
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index dd398ba11..fd5f2905b 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -121,7 +121,7 @@
         <command label="FB Alpha 2012">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fbalpha2012_libretro.dll %ROM%</command>
         <command label="Flycast">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\flycast_libretro.dll %ROM%</command>
         <command label="Flycast (Standalone)">%EMULATOR_FLYCAST% %ROM%</command>
-        <command label="Model 2 Emulator (Standalone)">%RUNINBACKGROUND% %STARTDIR%=%EMUDIR% %EMULATOR_MODEL2% %BASENAME%</command>
+        <command label="Model 2 Emulator (Standalone)">%RUNINBACKGROUND% %STARTDIR%=%EMUDIR% %EMULATOR_M2EMULATOR% %BASENAME%</command>
         <command label="Supermodel (Standalone)">%STARTDIR%=%EMUDIR% %EMULATOR_SUPERMODEL% -fullscreen %ROM%</command>
         <platform>arcade</platform>
         <theme>arcade</theme>
@@ -624,7 +624,7 @@
         <command label="FB Alpha 2012">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fbalpha2012_libretro.dll %ROM%</command>
         <command label="Flycast">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\flycast_libretro.dll %ROM%</command>
         <command label="Flycast (Standalone)">%EMULATOR_FLYCAST% %ROM%</command>
-        <command label="Model 2 Emulator (Standalone)">%RUNINBACKGROUND% %STARTDIR%=%EMUDIR% %EMULATOR_MODEL2% %BASENAME%</command>
+        <command label="Model 2 Emulator (Standalone)">%RUNINBACKGROUND% %STARTDIR%=%EMUDIR% %EMULATOR_M2EMULATOR% %BASENAME%</command>
         <command label="Supermodel (Standalone)">%STARTDIR%=%EMUDIR% %EMULATOR_SUPERMODEL% -fullscreen %ROM%</command>
         <platform>arcade</platform>
         <theme>mame</theme>
@@ -708,7 +708,7 @@
         <fullname>Sega Model 2</fullname>
         <path>%ROMPATH%\model2</path>
         <extension>.7z .7Z .zip .ZIP</extension>
-        <command label="Model 2 Emulator (Standalone)">%RUNINBACKGROUND% %STARTDIR%=%EMUDIR% %EMULATOR_MODEL2% %BASENAME%</command>
+        <command label="Model 2 Emulator (Standalone)">%RUNINBACKGROUND% %STARTDIR%=%EMUDIR% %EMULATOR_M2EMULATOR% %BASENAME%</command>
         <platform>arcade</platform>
         <theme>model2</theme>
     </system>