diff --git a/config/emulators/bbc.conf b/config/emulators/bbc.conf
deleted file mode 100644
index 2054b1c8bb..0000000000
--- a/config/emulators/bbc.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-SYSTEM_NAME="bbc"
-SYSTEM_FULLNAME="BBC Micro"
-SYSTEM_MANUFACTURER="Acorn"
-SYSTEM_RELEASE="1981"
-SYSTEM_HARDWARE="computer"
-SYSTEM_PATH="/storage/roms/bbc"
-SYSTEM_EXTENSION=".ssd .dsd"
-SYSTEM_PLATFORM="bbc"
-SYSTEM_THEME="bbc"
-SYSTEM_WIKI_PATH="bbc"
diff --git a/config/emulators/bbcmicro.conf b/config/emulators/bbcmicro.conf
new file mode 100644
index 0000000000..ab7951c9b7
--- /dev/null
+++ b/config/emulators/bbcmicro.conf
@@ -0,0 +1,10 @@
+SYSTEM_NAME="bbcmicro"
+SYSTEM_FULLNAME="BBC Micro"
+SYSTEM_MANUFACTURER="Acorn"
+SYSTEM_RELEASE="1981"
+SYSTEM_HARDWARE="computer"
+SYSTEM_PATH="/storage/roms/bbcmicro"
+SYSTEM_EXTENSION=".ssd .dsd"
+SYSTEM_PLATFORM="bbcmicro"
+SYSTEM_THEME="bbcmicro"
+SYSTEM_WIKI_PATH="bbcmicro"
diff --git a/documentation/PER_DEVICE_DOCUMENTATION/H700/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/H700/SUPPORTED_EMULATORS_AND_CORES.md
index e3b3ffd290..3d068c7e44 100644
--- a/documentation/PER_DEVICE_DOCUMENTATION/H700/SUPPORTED_EMULATORS_AND_CORES.md
+++ b/documentation/PER_DEVICE_DOCUMENTATION/H700/SUPPORTED_EMULATORS_AND_CORES.md
@@ -6,7 +6,7 @@
 |&#xf013; System|Ports (ports)|System|`ports`|.sh|**portmaster:** portmaster (default)<br>|
 |&#xf013; System|Screenshots (imageviewer)|System|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
 |&#xf013; System|Tools (tools)|System|`modules`|.sh||
-|Acorn|BBC Micro (bbc)|1981|`bbc`|.ssd .dsd|**retroarch:** b2 (default)<br>|
+|Acorn|BBC Micro (bbcmicro)|1981|`bbcmicro`|.ssd .dsd|**retroarch:** b2 (default)<br>|
 |Amstrad|Amstrad CPC (amstradcpc)|1984|`amstradcpc`|.dsk .cpr .sna .tap .cdt .kcr .voc .m3u .zip .7z|**retroarch:** crocods (default)<br>**retroarch:** cap32<br>|
 |Apple|Macintosh (macintosh)|1984|`mac`|.dsk .img .hfv .cmd .zip|**retroarch:** minivmac (default)<br>|
 |Arcade|Arcade (arcade)|0000|`arcade`|.zip .7z|**retroarch:** mame2003_plus (default)<br>**retroarch:** mame2010<br>**retroarch:** mame2015<br>**retroarch:** fbneo<br>**retroarch:** fbalpha2012<br>**retroarch:** fbalpha2019<br>**retroarch:** mame<br>|
diff --git a/documentation/PER_DEVICE_DOCUMENTATION/SM8250/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/SM8250/SUPPORTED_EMULATORS_AND_CORES.md
index ae64a3b3fc..f32ae05919 100644
--- a/documentation/PER_DEVICE_DOCUMENTATION/SM8250/SUPPORTED_EMULATORS_AND_CORES.md
+++ b/documentation/PER_DEVICE_DOCUMENTATION/SM8250/SUPPORTED_EMULATORS_AND_CORES.md
@@ -6,7 +6,7 @@
 |&#xf013; System|Ports (ports)|System|`ports`|.sh|**portmaster:** portmaster (default)<br>|
 |&#xf013; System|Screenshots (imageviewer)|System|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
 |&#xf013; System|Tools (tools)|System|`modules`|.sh||
-|Acorn|BBC Micro (bbc)|1981|`bbc`|.ssd .dsd|**retroarch:** b2 (default)<br>|
+|Acorn|BBC Micro (bbcmicro)|1981|`bbcmicro`|.ssd .dsd|**retroarch:** b2 (default)<br>|
 |Amstrad|Amstrad CPC (amstradcpc)|1984|`amstradcpc`|.dsk .cpr .sna .tap .cdt .kcr .voc .m3u .zip .7z|**retroarch:** crocods (default)<br>**retroarch:** cap32<br>|
 |Apple|Macintosh (macintosh)|1984|`mac`|.dsk .img .hfv .cmd .zip|**retroarch:** minivmac (default)<br>|
 |Arcade|Arcade (arcade)|0000|`arcade`|.zip .7z|**retroarch:** mame2003_plus (default)<br>**retroarch:** mame2010<br>**retroarch:** mame2015<br>**retroarch:** fbneo<br>**retroarch:** fbalpha2012<br>**retroarch:** fbalpha2019<br>**retroarch:** mame<br>|
diff --git a/projects/ROCKNIX/packages/virtual/emulators/package.mk b/projects/ROCKNIX/packages/virtual/emulators/package.mk
index eaaa481eca..91089e25a7 100644
--- a/projects/ROCKNIX/packages/virtual/emulators/package.mk
+++ b/projects/ROCKNIX/packages/virtual/emulators/package.mk
@@ -142,8 +142,8 @@ makeinstall_target() {
   start_system_doc
 
   ### Acorn BBC Micro
-  add_emu_core bbc retroarch b2 true
-  add_es_system bbc
+  add_emu_core bbcmicro retroarch b2 true
+  add_es_system bbcmicro
 
   ### Panasonic 3DO
   add_emu_core 3do retroarch opera true