diff --git a/mods/cnc/maps/Instant_Karma.oramap b/mods/cnc/maps/Instant_Karma.oramap
deleted file mode 100644
index b0d472d69b..0000000000
Binary files a/mods/cnc/maps/Instant_Karma.oramap and /dev/null differ
diff --git a/mods/cnc/maps/Nullpeter.oramap b/mods/cnc/maps/Nullpeter.oramap
deleted file mode 100644
index c76edde99b..0000000000
Binary files a/mods/cnc/maps/Nullpeter.oramap and /dev/null differ
diff --git a/mods/cnc/maps/_lostsouls.oramap b/mods/cnc/maps/_lostsouls.oramap
deleted file mode 100644
index eff22efb14..0000000000
Binary files a/mods/cnc/maps/_lostsouls.oramap and /dev/null differ
diff --git a/mods/cnc/maps/aggressivetendencies.oramap b/mods/cnc/maps/aggressive-tendencies.oramap
similarity index 84%
rename from mods/cnc/maps/aggressivetendencies.oramap
rename to mods/cnc/maps/aggressive-tendencies.oramap
index 83cf9c8a96..a168a78c07 100644
Binary files a/mods/cnc/maps/aggressivetendencies.oramap and b/mods/cnc/maps/aggressive-tendencies.oramap differ
diff --git a/mods/cnc/maps/alpha-juno-5.oramap b/mods/cnc/maps/alpha-juno-5.oramap
new file mode 100644
index 0000000000..652bf14a69
Binary files /dev/null and b/mods/cnc/maps/alpha-juno-5.oramap differ
diff --git a/mods/cnc/maps/antrax.oramap b/mods/cnc/maps/antrax.oramap
new file mode 100644
index 0000000000..fb1af44838
Binary files /dev/null and b/mods/cnc/maps/antrax.oramap differ
diff --git a/mods/cnc/maps/avocado.oramap b/mods/cnc/maps/avocado.oramap
index 5283f57716..74b524d637 100644
Binary files a/mods/cnc/maps/avocado.oramap and b/mods/cnc/maps/avocado.oramap differ
diff --git a/mods/cnc/maps/axis-of-advance.oramap b/mods/cnc/maps/axis-of-advance.oramap
new file mode 100644
index 0000000000..276ca2fa25
Binary files /dev/null and b/mods/cnc/maps/axis-of-advance.oramap differ
diff --git a/mods/cnc/maps/back-to-basics-6p.oramap b/mods/cnc/maps/back-to-basics-6p.oramap
new file mode 100644
index 0000000000..667eba5617
Binary files /dev/null and b/mods/cnc/maps/back-to-basics-6p.oramap differ
diff --git a/mods/cnc/maps/back-to-basics-8p.oramap b/mods/cnc/maps/back-to-basics-8p.oramap
new file mode 100644
index 0000000000..cbf5e83d78
Binary files /dev/null and b/mods/cnc/maps/back-to-basics-8p.oramap differ
diff --git a/mods/cnc/maps/black-tiberian-war.oramap b/mods/cnc/maps/black-tiberian-war.oramap
new file mode 100644
index 0000000000..21899deba5
Binary files /dev/null and b/mods/cnc/maps/black-tiberian-war.oramap differ
diff --git a/mods/cnc/maps/botany.oramap b/mods/cnc/maps/botany.oramap
new file mode 100644
index 0000000000..7a143b0cbb
Binary files /dev/null and b/mods/cnc/maps/botany.oramap differ
diff --git a/mods/cnc/maps/braided-river.oramap b/mods/cnc/maps/braided-river.oramap
new file mode 100644
index 0000000000..336df7a65e
Binary files /dev/null and b/mods/cnc/maps/braided-river.oramap differ
diff --git a/mods/cnc/maps/break_of_day.oramap b/mods/cnc/maps/break-of-day.oramap
similarity index 100%
rename from mods/cnc/maps/break_of_day.oramap
rename to mods/cnc/maps/break-of-day.oramap
diff --git a/mods/cnc/maps/burning-hammer.oramap b/mods/cnc/maps/burning-hammer.oramap
new file mode 100644
index 0000000000..28400dc66b
Binary files /dev/null and b/mods/cnc/maps/burning-hammer.oramap differ
diff --git a/mods/cnc/maps/control-and-chaos-6p.oramap b/mods/cnc/maps/control-and-chaos-6p.oramap
new file mode 100644
index 0000000000..4de35fdecf
Binary files /dev/null and b/mods/cnc/maps/control-and-chaos-6p.oramap differ
diff --git a/mods/cnc/maps/control-and-chaos-8p.oramap b/mods/cnc/maps/control-and-chaos-8p.oramap
new file mode 100644
index 0000000000..8eb9c8c26a
Binary files /dev/null and b/mods/cnc/maps/control-and-chaos-8p.oramap differ
diff --git a/mods/cnc/maps/dead_in_motion_2.oramap b/mods/cnc/maps/dead_in_motion_2.oramap
deleted file mode 100644
index 171378be3d..0000000000
Binary files a/mods/cnc/maps/dead_in_motion_2.oramap and /dev/null differ
diff --git a/mods/cnc/maps/desert-storm-3.oramap b/mods/cnc/maps/desert-storm-3.oramap
new file mode 100644
index 0000000000..feff06d680
Binary files /dev/null and b/mods/cnc/maps/desert-storm-3.oramap differ
diff --git a/mods/cnc/maps/desert-storm-5.oramap b/mods/cnc/maps/desert-storm-5.oramap
new file mode 100644
index 0000000000..592ce36046
Binary files /dev/null and b/mods/cnc/maps/desert-storm-5.oramap differ
diff --git a/mods/cnc/maps/deterring_democracy.oramap b/mods/cnc/maps/deterring_democracy.oramap
deleted file mode 100644
index 5c23877922..0000000000
Binary files a/mods/cnc/maps/deterring_democracy.oramap and /dev/null differ
diff --git a/mods/cnc/maps/deterring_democracy_plus.oramap b/mods/cnc/maps/deterring_democracy_plus.oramap
deleted file mode 100644
index a9d12f33fc..0000000000
Binary files a/mods/cnc/maps/deterring_democracy_plus.oramap and /dev/null differ
diff --git a/mods/cnc/maps/east-vs-west-3.oramap b/mods/cnc/maps/east-vs-west-3.oramap
new file mode 100644
index 0000000000..cbaecc3a48
Binary files /dev/null and b/mods/cnc/maps/east-vs-west-3.oramap differ
diff --git a/mods/cnc/maps/eastwest3.oramap b/mods/cnc/maps/eastwest3.oramap
deleted file mode 100644
index 2a58fd1e28..0000000000
Binary files a/mods/cnc/maps/eastwest3.oramap and /dev/null differ
diff --git a/mods/cnc/maps/escalations.oramap b/mods/cnc/maps/escalations.oramap
index 3121e57fb7..d2117fb08f 100644
Binary files a/mods/cnc/maps/escalations.oramap and b/mods/cnc/maps/escalations.oramap differ
diff --git a/mods/cnc/maps/frontal-assault.oramap b/mods/cnc/maps/frontal-assault.oramap
new file mode 100644
index 0000000000..45512076ca
Binary files /dev/null and b/mods/cnc/maps/frontal-assault.oramap differ
diff --git a/mods/cnc/maps/ground-zero.oramap b/mods/cnc/maps/ground-zero.oramap
new file mode 100644
index 0000000000..6770caedcc
Binary files /dev/null and b/mods/cnc/maps/ground-zero.oramap differ
diff --git a/mods/cnc/maps/guarana.oramap b/mods/cnc/maps/guarana.oramap
new file mode 100644
index 0000000000..ecd18d6090
Binary files /dev/null and b/mods/cnc/maps/guarana.oramap differ
diff --git a/mods/cnc/maps/haos-ridges-cnc.oramap b/mods/cnc/maps/haos-ridges-cnc.oramap
new file mode 100644
index 0000000000..87a6af92b8
Binary files /dev/null and b/mods/cnc/maps/haos-ridges-cnc.oramap differ
diff --git a/mods/cnc/maps/haos_ridges_cnc.oramap b/mods/cnc/maps/haos_ridges_cnc.oramap
deleted file mode 100644
index b0eec7086f..0000000000
Binary files a/mods/cnc/maps/haos_ridges_cnc.oramap and /dev/null differ
diff --git a/mods/cnc/maps/hegemony_or_survival.oramap b/mods/cnc/maps/hegemony_or_survival.oramap
deleted file mode 100644
index bbc785658e..0000000000
Binary files a/mods/cnc/maps/hegemony_or_survival.oramap and /dev/null differ
diff --git a/mods/cnc/maps/hegemony_or_survival_8p.oramap b/mods/cnc/maps/hegemony_or_survival_8p.oramap
deleted file mode 100644
index 375e8ec1b0..0000000000
Binary files a/mods/cnc/maps/hegemony_or_survival_8p.oramap and /dev/null differ
diff --git a/mods/cnc/maps/into_the_river_below.oramap b/mods/cnc/maps/into_the_river_below.oramap
deleted file mode 100644
index beb7c817a5..0000000000
Binary files a/mods/cnc/maps/into_the_river_below.oramap and /dev/null differ
diff --git a/mods/cnc/maps/IN-IslandDuel.oramap b/mods/cnc/maps/island-duel.oramap
similarity index 90%
rename from mods/cnc/maps/IN-IslandDuel.oramap
rename to mods/cnc/maps/island-duel.oramap
index 78933dbc83..d4fd9c2adc 100644
Binary files a/mods/cnc/maps/IN-IslandDuel.oramap and b/mods/cnc/maps/island-duel.oramap differ
diff --git a/mods/cnc/maps/kolosseum-6p.oramap b/mods/cnc/maps/kolosseum-6p.oramap
new file mode 100644
index 0000000000..bbb5b6a41e
Binary files /dev/null and b/mods/cnc/maps/kolosseum-6p.oramap differ
diff --git a/mods/cnc/maps/lessons_from_kosovo.oramap b/mods/cnc/maps/lessons_from_kosovo.oramap
deleted file mode 100644
index 2b0538b8b6..0000000000
Binary files a/mods/cnc/maps/lessons_from_kosovo.oramap and /dev/null differ
diff --git a/mods/cnc/maps/llamas.oramap b/mods/cnc/maps/llamas.oramap
deleted file mode 100644
index 39c9756a9e..0000000000
Binary files a/mods/cnc/maps/llamas.oramap and /dev/null differ
diff --git a/mods/cnc/maps/llamas2.oramap b/mods/cnc/maps/llamas2.oramap
deleted file mode 100644
index 19fce00b1d..0000000000
Binary files a/mods/cnc/maps/llamas2.oramap and /dev/null differ
diff --git a/mods/cnc/maps/lost-souls.oramap b/mods/cnc/maps/lost-souls.oramap
new file mode 100644
index 0000000000..df18bfaf39
Binary files /dev/null and b/mods/cnc/maps/lost-souls.oramap differ
diff --git a/mods/cnc/maps/manufacturing-consent-ns.oramap b/mods/cnc/maps/manufacturing-consent-ns.oramap
new file mode 100644
index 0000000000..38b57ec364
Binary files /dev/null and b/mods/cnc/maps/manufacturing-consent-ns.oramap differ
diff --git a/mods/cnc/maps/manufacturing-consent.oramap b/mods/cnc/maps/manufacturing-consent.oramap
new file mode 100644
index 0000000000..29ceda8223
Binary files /dev/null and b/mods/cnc/maps/manufacturing-consent.oramap differ
diff --git a/mods/cnc/maps/manufacturing_consent.oramap b/mods/cnc/maps/manufacturing_consent.oramap
deleted file mode 100644
index 81cab937e2..0000000000
Binary files a/mods/cnc/maps/manufacturing_consent.oramap and /dev/null differ
diff --git a/mods/cnc/maps/minus_two.oramap b/mods/cnc/maps/minus_two.oramap
deleted file mode 100644
index 851d14672c..0000000000
Binary files a/mods/cnc/maps/minus_two.oramap and /dev/null differ
diff --git a/mods/cnc/maps/morbid-aimless-poseidon-2.oramap b/mods/cnc/maps/morbid-aimless-poseidon.oramap
similarity index 100%
rename from mods/cnc/maps/morbid-aimless-poseidon-2.oramap
rename to mods/cnc/maps/morbid-aimless-poseidon.oramap
diff --git a/mods/cnc/maps/mtnukebait.oramap b/mods/cnc/maps/mtnukebait.oramap
deleted file mode 100644
index 3d3ad62f22..0000000000
Binary files a/mods/cnc/maps/mtnukebait.oramap and /dev/null differ
diff --git a/mods/cnc/maps/necessary_illusions.oramap b/mods/cnc/maps/necessary_illusions.oramap
deleted file mode 100644
index 568fefc997..0000000000
Binary files a/mods/cnc/maps/necessary_illusions.oramap and /dev/null differ
diff --git a/mods/cnc/maps/order-of-battle-10p.oramap b/mods/cnc/maps/order-of-battle-10p.oramap
new file mode 100644
index 0000000000..c1f9979154
Binary files /dev/null and b/mods/cnc/maps/order-of-battle-10p.oramap differ
diff --git a/mods/cnc/maps/order-of-battle-8p.oramap b/mods/cnc/maps/order-of-battle-8p.oramap
new file mode 100644
index 0000000000..e75808b8b7
Binary files /dev/null and b/mods/cnc/maps/order-of-battle-8p.oramap differ
diff --git a/mods/cnc/maps/ping-pong-bay.oramap b/mods/cnc/maps/ping-pong-bay.oramap
new file mode 100644
index 0000000000..43916861a2
Binary files /dev/null and b/mods/cnc/maps/ping-pong-bay.oramap differ
diff --git a/mods/cnc/maps/pirates_and_emperors.oramap b/mods/cnc/maps/pirates-and-emperors.oramap
similarity index 100%
rename from mods/cnc/maps/pirates_and_emperors.oramap
rename to mods/cnc/maps/pirates-and-emperors.oramap
diff --git a/mods/cnc/maps/pressure_cnc.oramap b/mods/cnc/maps/pressure-cnc.oramap
similarity index 66%
rename from mods/cnc/maps/pressure_cnc.oramap
rename to mods/cnc/maps/pressure-cnc.oramap
index 7fc45acbc3..eb576d5f7f 100644
Binary files a/mods/cnc/maps/pressure_cnc.oramap and b/mods/cnc/maps/pressure-cnc.oramap differ
diff --git a/mods/cnc/maps/profit_over_people.oramap b/mods/cnc/maps/profit_over_people.oramap
deleted file mode 100644
index 81b351f214..0000000000
Binary files a/mods/cnc/maps/profit_over_people.oramap and /dev/null differ
diff --git a/mods/cnc/maps/riverside-frontline.oramap b/mods/cnc/maps/riverside-frontline.oramap
new file mode 100644
index 0000000000..e006a9875a
Binary files /dev/null and b/mods/cnc/maps/riverside-frontline.oramap differ
diff --git a/mods/cnc/maps/rogue-math.oramap b/mods/cnc/maps/rogue-math.oramap
new file mode 100644
index 0000000000..d1f1180f1a
Binary files /dev/null and b/mods/cnc/maps/rogue-math.oramap differ
diff --git a/mods/cnc/maps/rogue_states.oramap b/mods/cnc/maps/rogue_states.oramap
deleted file mode 100644
index c4257f9eda..0000000000
Binary files a/mods/cnc/maps/rogue_states.oramap and /dev/null differ
diff --git a/mods/cnc/maps/rubicon.oramap b/mods/cnc/maps/rubicon.oramap
deleted file mode 100644
index 225627dfbe..0000000000
Binary files a/mods/cnc/maps/rubicon.oramap and /dev/null differ
diff --git a/mods/cnc/maps/sandstorm.oramap b/mods/cnc/maps/sandstorm.oramap
deleted file mode 100644
index d79bcda61c..0000000000
Binary files a/mods/cnc/maps/sandstorm.oramap and /dev/null differ
diff --git a/mods/cnc/maps/sea_and_cake.oramap b/mods/cnc/maps/sea-and-cake.oramap
similarity index 100%
rename from mods/cnc/maps/sea_and_cake.oramap
rename to mods/cnc/maps/sea-and-cake.oramap
diff --git a/mods/cnc/maps/chord_simple.oramap b/mods/cnc/maps/simple-chord.oramap
similarity index 100%
rename from mods/cnc/maps/chord_simple.oramap
rename to mods/cnc/maps/simple-chord.oramap
diff --git a/mods/cnc/maps/sustain.oramap b/mods/cnc/maps/sustain.oramap
new file mode 100644
index 0000000000..f46abe24a9
Binary files /dev/null and b/mods/cnc/maps/sustain.oramap differ
diff --git a/mods/cnc/maps/the_hourglass.oramap b/mods/cnc/maps/the-hourglass.oramap
similarity index 100%
rename from mods/cnc/maps/the_hourglass.oramap
rename to mods/cnc/maps/the-hourglass.oramap
diff --git a/mods/cnc/maps/thesentinel.oramap b/mods/cnc/maps/thesentinel.oramap
deleted file mode 100644
index 48b92e8c35..0000000000
Binary files a/mods/cnc/maps/thesentinel.oramap and /dev/null differ
diff --git a/mods/cnc/maps/tiberian-war-4p.oramap b/mods/cnc/maps/tiberian-war-4p.oramap
new file mode 100644
index 0000000000..47a859c060
Binary files /dev/null and b/mods/cnc/maps/tiberian-war-4p.oramap differ
diff --git a/mods/cnc/maps/tiberium-connected-8p.oramap b/mods/cnc/maps/tiberium-connected-8p.oramap
new file mode 100644
index 0000000000..7ca0552d8d
Binary files /dev/null and b/mods/cnc/maps/tiberium-connected-8p.oramap differ
diff --git a/mods/cnc/maps/garden2.oramap b/mods/cnc/maps/tiberium-garden.oramap
similarity index 100%
rename from mods/cnc/maps/garden2.oramap
rename to mods/cnc/maps/tiberium-garden.oramap
diff --git a/mods/cnc/maps/too-hot.oramap b/mods/cnc/maps/too-hot.oramap
new file mode 100644
index 0000000000..6beb343f60
Binary files /dev/null and b/mods/cnc/maps/too-hot.oramap differ
diff --git a/mods/cnc/maps/treasure-island-2.oramap b/mods/cnc/maps/treasure-island-2.oramap
deleted file mode 100644
index 7427343f36..0000000000
Binary files a/mods/cnc/maps/treasure-island-2.oramap and /dev/null differ
diff --git a/mods/cnc/maps/treasure-island.oramap b/mods/cnc/maps/treasure-island.oramap
new file mode 100644
index 0000000000..e06c0f3e69
Binary files /dev/null and b/mods/cnc/maps/treasure-island.oramap differ
diff --git a/mods/cnc/maps/twisted-peak.oramap b/mods/cnc/maps/twisted-peak.oramap
new file mode 100644
index 0000000000..3273cc45e5
Binary files /dev/null and b/mods/cnc/maps/twisted-peak.oramap differ
diff --git a/mods/cnc/maps/two-ponds.oramap b/mods/cnc/maps/two-ponds.oramap
deleted file mode 100644
index cfe9d0881a..0000000000
Binary files a/mods/cnc/maps/two-ponds.oramap and /dev/null differ
diff --git a/mods/cnc/maps/valley-of-gold-10p.oramap b/mods/cnc/maps/valley-of-gold-10p.oramap
new file mode 100644
index 0000000000..439d345dea
Binary files /dev/null and b/mods/cnc/maps/valley-of-gold-10p.oramap differ
diff --git a/mods/cnc/maps/valley-of-gold-12p.oramap b/mods/cnc/maps/valley-of-gold-12p.oramap
new file mode 100644
index 0000000000..f1d7d93c5d
Binary files /dev/null and b/mods/cnc/maps/valley-of-gold-12p.oramap differ
diff --git a/mods/cnc/maps/valley-of-gold-2p.oramap b/mods/cnc/maps/valley-of-gold-2p.oramap
new file mode 100644
index 0000000000..340d8c89a8
Binary files /dev/null and b/mods/cnc/maps/valley-of-gold-2p.oramap differ
diff --git a/mods/cnc/maps/valley-of-gold-4p.oramap b/mods/cnc/maps/valley-of-gold-4p.oramap
new file mode 100644
index 0000000000..aeb40ed3b6
Binary files /dev/null and b/mods/cnc/maps/valley-of-gold-4p.oramap differ
diff --git a/mods/cnc/maps/valley-of-gold-6p.oramap b/mods/cnc/maps/valley-of-gold-6p.oramap
new file mode 100644
index 0000000000..91e13475f1
Binary files /dev/null and b/mods/cnc/maps/valley-of-gold-6p.oramap differ
diff --git a/mods/cnc/maps/valley-of-gold-8p.oramap b/mods/cnc/maps/valley-of-gold-8p.oramap
new file mode 100644
index 0000000000..c11ee29ea3
Binary files /dev/null and b/mods/cnc/maps/valley-of-gold-8p.oramap differ
diff --git a/mods/cnc/maps/vectors-of-battle-10p.oramap b/mods/cnc/maps/vectors-of-battle-10p.oramap
new file mode 100644
index 0000000000..2f7bbf912c
Binary files /dev/null and b/mods/cnc/maps/vectors-of-battle-10p.oramap differ
diff --git a/mods/cnc/maps/vectors-of-battle-6p.oramap b/mods/cnc/maps/vectors-of-battle-6p.oramap
new file mode 100644
index 0000000000..cc1e28baa6
Binary files /dev/null and b/mods/cnc/maps/vectors-of-battle-6p.oramap differ
diff --git a/mods/cnc/maps/vectors-of-battle-8p.oramap b/mods/cnc/maps/vectors-of-battle-8p.oramap
new file mode 100644
index 0000000000..3a2d725fc3
Binary files /dev/null and b/mods/cnc/maps/vectors-of-battle-8p.oramap differ
diff --git a/mods/cnc/maps/vectorsofbattle.oramap b/mods/cnc/maps/vectorsofbattle.oramap
deleted file mode 100644
index 322510a239..0000000000
Binary files a/mods/cnc/maps/vectorsofbattle.oramap and /dev/null differ
diff --git a/mods/cnc/maps/warkraft.oramap b/mods/cnc/maps/warkraft.oramap
new file mode 100644
index 0000000000..85f37d5f3c
Binary files /dev/null and b/mods/cnc/maps/warkraft.oramap differ
diff --git a/mods/cnc/maps/white_acres.oramap b/mods/cnc/maps/white_acres.oramap
deleted file mode 100644
index 4103a8436c..0000000000
Binary files a/mods/cnc/maps/white_acres.oramap and /dev/null differ