diff --git a/mods/cnc/chrome/ingame.yaml b/mods/cnc/chrome/ingame.yaml
index 3ce898813e..08da74c66a 100644
--- a/mods/cnc/chrome/ingame.yaml
+++ b/mods/cnc/chrome/ingame.yaml
@@ -273,7 +273,7 @@ Background@FMVPLAYER:
 	Height:WINDOW_BOTTOM
 	Background:panel-black
 	Children:
-		VqaPlayer:
+		VqaPlayer@PLAYER:
 			X:0
 			Y:0
 			Width:WINDOW_RIGHT
diff --git a/mods/cnc-classic/maps/gdi01/map.bin b/mods/cnc/maps/gdi01/map.bin
similarity index 100%
rename from mods/cnc-classic/maps/gdi01/map.bin
rename to mods/cnc/maps/gdi01/map.bin
diff --git a/mods/cnc-classic/maps/gdi01/map.yaml b/mods/cnc/maps/gdi01/map.yaml
similarity index 99%
rename from mods/cnc-classic/maps/gdi01/map.yaml
rename to mods/cnc/maps/gdi01/map.yaml
index a0e2c81a7d..3bc9b2f4b8 100644
--- a/mods/cnc-classic/maps/gdi01/map.yaml
+++ b/mods/cnc/maps/gdi01/map.yaml
@@ -2,7 +2,7 @@ Selectable: True
 
 MapFormat: 5
 
-RequiresMod: cnc-classic
+RequiresMod: cnc
 
 Title: Storm the Beachhead
 
diff --git a/mods/cnc-classic/maps/nod01/map.bin b/mods/cnc/maps/nod01/map.bin
similarity index 100%
rename from mods/cnc-classic/maps/nod01/map.bin
rename to mods/cnc/maps/nod01/map.bin
diff --git a/mods/cnc-classic/maps/nod01/map.yaml b/mods/cnc/maps/nod01/map.yaml
similarity index 99%
rename from mods/cnc-classic/maps/nod01/map.yaml
rename to mods/cnc/maps/nod01/map.yaml
index 9ed0571f31..5950dca237 100644
--- a/mods/cnc-classic/maps/nod01/map.yaml
+++ b/mods/cnc/maps/nod01/map.yaml
@@ -2,6 +2,8 @@ Selectable: True
 
 MapFormat: 5
 
+RequiresMod: cnc
+
 Title: Nikoomba's Demise
 
 Description: Conversion of first Nod mission from Cnc