diff --git a/scripts/target/mame/mame.lua b/scripts/target/mame/mame.lua
index f104b046e78..176c5bea5b6 100644
--- a/scripts/target/mame/mame.lua
+++ b/scripts/target/mame/mame.lua
@@ -1333,7 +1333,6 @@ function linkProjects_mame_mame(_target, _subtarget)
 		"einis",
 		"elektor",
 		"elektron",
-		"elektronika",
 		"emusys",
 		"ensoniq",
 		"enterprise",
@@ -2157,12 +2156,6 @@ files {
 	MAME_DIR .. "src/mame/elektron/*.cpp",
 }
 
-createMAMEProjects(_target, _subtarget, "elektronika")
-files {
-	MAME_DIR .. "src/mame/elektronika/*.cpp",
-	MAME_DIR .. "src/mame/elektronika/*.h",
-}
-
 createMAMEProjects(_target, _subtarget, "emusys")
 files {
 	MAME_DIR .. "src/mame/emusys/*.cpp",
diff --git a/src/mame/elektronika/bk.cpp b/src/mame/cccp/bk.cpp
similarity index 100%
rename from src/mame/elektronika/bk.cpp
rename to src/mame/cccp/bk.cpp
diff --git a/src/mame/elektronika/bk.h b/src/mame/cccp/bk.h
similarity index 100%
rename from src/mame/elektronika/bk.h
rename to src/mame/cccp/bk.h
diff --git a/src/mame/elektronika/bk_m.cpp b/src/mame/cccp/bk_m.cpp
similarity index 100%
rename from src/mame/elektronika/bk_m.cpp
rename to src/mame/cccp/bk_m.cpp
diff --git a/src/mame/elektronika/dvk_kcgd.cpp b/src/mame/cccp/dvk_kcgd.cpp
similarity index 100%
rename from src/mame/elektronika/dvk_kcgd.cpp
rename to src/mame/cccp/dvk_kcgd.cpp
diff --git a/src/mame/elektronika/dvk_ksm.cpp b/src/mame/cccp/dvk_ksm.cpp
similarity index 100%
rename from src/mame/elektronika/dvk_ksm.cpp
rename to src/mame/cccp/dvk_ksm.cpp
diff --git a/src/mame/elektronika/im01.cpp b/src/mame/cccp/im01.cpp
similarity index 100%
rename from src/mame/elektronika/im01.cpp
rename to src/mame/cccp/im01.cpp
diff --git a/src/mame/elektronika/mk85.cpp b/src/mame/cccp/mk85.cpp
similarity index 100%
rename from src/mame/elektronika/mk85.cpp
rename to src/mame/cccp/mk85.cpp
diff --git a/src/mame/elektronika/mk90.cpp b/src/mame/cccp/mk90.cpp
similarity index 100%
rename from src/mame/elektronika/mk90.cpp
rename to src/mame/cccp/mk90.cpp
diff --git a/src/mame/elektronika/mk98.cpp b/src/mame/cccp/mk98.cpp
similarity index 100%
rename from src/mame/elektronika/mk98.cpp
rename to src/mame/cccp/mk98.cpp
diff --git a/src/mame/elektronika/ms6102.cpp b/src/mame/cccp/ms6102.cpp
similarity index 100%
rename from src/mame/elektronika/ms6102.cpp
rename to src/mame/cccp/ms6102.cpp
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 53512c989bc..1ba831e11b4 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -9444,7 +9444,7 @@ t3210                           //
 bitgrpha                        //
 bitgrphb                        //
 
-@source:elektronika/bk.cpp
+@source:cccp/bk.cpp
 bk0010                          //
 bk001001                        //
 bk0010fd                        //
@@ -12798,10 +12798,10 @@ duet16                          //
 @source:igs/dunhuang.cpp
 dunhuang                        // (c) 1995
 
-@source:elektronika/dvk_kcgd.cpp
+@source:cccp/dvk_kcgd.cpp
 dvk_kcgd                        //
 
-@source:elektronika/dvk_ksm.cpp
+@source:cccp/dvk_ksm.cpp
 dvk_ksm                         //
 
 @source:misc/dwarfd.cpp
@@ -17371,7 +17371,7 @@ ikki                            // TVG17 (c) 1985 Sun Electronics (Japan)
 @source:skeleton/ikt5a.cpp
 ikt5a                           //
 
-@source:elektronika/im01.cpp
+@source:cccp/im01.cpp
 im01
 im01t
 im05
@@ -24050,13 +24050,13 @@ mk1forth                        // (c) 2003 Andrew Holme
 @source:trainer/mk14.cpp
 mk14                            //
 
-@source:elektronika/mk85.cpp
+@source:cccp/mk85.cpp
 mk85                            //
 
-@source:elektronika/mk90.cpp
+@source:cccp/mk90.cpp
 mk90                            //
 
-@source:elektronika/mk98.cpp
+@source:cccp/mk98.cpp
 mk98                            //
 
 @source:multitch/mkit09.cpp
@@ -31118,7 +31118,7 @@ mrjong                          // (c) 1983 Kiwako
 @source:skeleton/ms0515.cpp
 ms0515                          //
 
-@source:elektronika/ms6102.cpp
+@source:cccp/ms6102.cpp
 ms6102                          //
 
 @source:jaleco/ms32.cpp
diff --git a/src/mame/mess.flt b/src/mame/mess.flt
index 7ce64417850..b6a87eb4945 100644
--- a/src/mame/mess.flt
+++ b/src/mame/mess.flt
@@ -130,11 +130,19 @@ cbm/plus4.cpp
 cbm/vic10.cpp
 cbm/vic20.cpp
 cccp/argo.cpp
+cccp/bk.cpp
 cccp/cm1800.cpp
 cccp/debut.cpp
+cccp/dvk_kcgd.cpp
+cccp/dvk_ksm.cpp
+cccp/im01.cpp
 cccp/intellect02.cpp
 cccp/lviv.cpp
 cccp/mikro80.cpp
+cccp/mk85.cpp
+cccp/mk90.cpp
+cccp/mk98.cpp
+cccp/ms6102.cpp
 cccp/okean240.cpp
 cccp/pk8000.cpp
 cccp/pk8020.cpp
@@ -216,14 +224,6 @@ elektor/ec65.cpp
 elektor/elekscmp.cpp
 elektor/junior.cpp
 elektron/elektronmono.cpp
-elektronika/bk.cpp
-elektronika/dvk_kcgd.cpp
-elektronika/dvk_ksm.cpp
-elektronika/im01.cpp
-elektronika/mk85.cpp
-elektronika/mk90.cpp
-elektronika/mk98.cpp
-elektronika/ms6102.cpp
 emusys/emax.cpp
 emusys/emu2.cpp
 emusys/emu3.cpp