diff --git a/public/images/flags/flat/16/Cape-Verde.png b/public/images/flags/flat/16/Cape-Verde-Islands.png
similarity index 100%
rename from public/images/flags/flat/16/Cape-Verde.png
rename to public/images/flags/flat/16/Cape-Verde-Islands.png
diff --git a/public/images/flags/flat/16/Macedonia.png b/public/images/flags/flat/16/FYR-Macedonia.png
similarity index 100%
rename from public/images/flags/flat/16/Macedonia.png
rename to public/images/flags/flat/16/FYR-Macedonia.png
diff --git a/public/images/flags/flat/24/Cape-Verde.png b/public/images/flags/flat/24/Cape-Verde-Islands.png
similarity index 100%
rename from public/images/flags/flat/24/Cape-Verde.png
rename to public/images/flags/flat/24/Cape-Verde-Islands.png
diff --git a/public/images/flags/flat/24/Macedonia.png b/public/images/flags/flat/24/FYR-Macedonia.png
similarity index 100%
rename from public/images/flags/flat/24/Macedonia.png
rename to public/images/flags/flat/24/FYR-Macedonia.png
diff --git a/public/images/flags/flat/32/Cape-Verde.png b/public/images/flags/flat/32/Cape-Verde-Islands.png
similarity index 100%
rename from public/images/flags/flat/32/Cape-Verde.png
rename to public/images/flags/flat/32/Cape-Verde-Islands.png
diff --git a/public/images/flags/flat/32/Macedonia.png b/public/images/flags/flat/32/FYR-Macedonia.png
similarity index 100%
rename from public/images/flags/flat/32/Macedonia.png
rename to public/images/flags/flat/32/FYR-Macedonia.png
diff --git a/public/images/flags/flat/48/Cape-Verde.png b/public/images/flags/flat/48/Cape-Verde-Islands.png
similarity index 100%
rename from public/images/flags/flat/48/Cape-Verde.png
rename to public/images/flags/flat/48/Cape-Verde-Islands.png
diff --git a/public/images/flags/flat/48/Macedonia.png b/public/images/flags/flat/48/FYR-Macedonia.png
similarity index 100%
rename from public/images/flags/flat/48/Macedonia.png
rename to public/images/flags/flat/48/FYR-Macedonia.png
diff --git a/public/images/flags/flat/64/Cape-Verde.png b/public/images/flags/flat/64/Cape-Verde-Islands.png
similarity index 100%
rename from public/images/flags/flat/64/Cape-Verde.png
rename to public/images/flags/flat/64/Cape-Verde-Islands.png
diff --git a/public/images/flags/flat/64/Macedonia.png b/public/images/flags/flat/64/FYR-Macedonia.png
similarity index 100%
rename from public/images/flags/flat/64/Macedonia.png
rename to public/images/flags/flat/64/FYR-Macedonia.png
diff --git a/public/images/flags/flat/icns/Cape-Verde.icns b/public/images/flags/flat/icns/Cape-Verde-Islands.icns
similarity index 100%
rename from public/images/flags/flat/icns/Cape-Verde.icns
rename to public/images/flags/flat/icns/Cape-Verde-Islands.icns
diff --git a/public/images/flags/flat/icns/Macedonia.icns b/public/images/flags/flat/icns/FYR-Macedonia.icns
similarity index 100%
rename from public/images/flags/flat/icns/Macedonia.icns
rename to public/images/flags/flat/icns/FYR-Macedonia.icns
diff --git a/public/images/flags/flat/ico/Cape-Verde.ico b/public/images/flags/flat/ico/Cape-Verde-Islands.ico
similarity index 100%
rename from public/images/flags/flat/ico/Cape-Verde.ico
rename to public/images/flags/flat/ico/Cape-Verde-Islands.ico
diff --git a/public/images/flags/flat/ico/Macedonia.ico b/public/images/flags/flat/ico/FYR-Macedonia.ico
similarity index 100%
rename from public/images/flags/flat/ico/Macedonia.ico
rename to public/images/flags/flat/ico/FYR-Macedonia.ico
diff --git a/public/images/flags/shiny/16/Cape-Verde.png b/public/images/flags/shiny/16/Cape-Verde-Islands.png
similarity index 100%
rename from public/images/flags/shiny/16/Cape-Verde.png
rename to public/images/flags/shiny/16/Cape-Verde-Islands.png
diff --git a/public/images/flags/shiny/16/Macedonia.png b/public/images/flags/shiny/16/FYR-Macedonia.png
similarity index 100%
rename from public/images/flags/shiny/16/Macedonia.png
rename to public/images/flags/shiny/16/FYR-Macedonia.png
diff --git a/public/images/flags/shiny/24/Cape-Verde.png b/public/images/flags/shiny/24/Cape-Verde-Islands.png
similarity index 100%
rename from public/images/flags/shiny/24/Cape-Verde.png
rename to public/images/flags/shiny/24/Cape-Verde-Islands.png
diff --git a/public/images/flags/shiny/24/Macedonia.png b/public/images/flags/shiny/24/FYR-Macedonia.png
similarity index 100%
rename from public/images/flags/shiny/24/Macedonia.png
rename to public/images/flags/shiny/24/FYR-Macedonia.png
diff --git a/public/images/flags/shiny/32/Cape-Verde.png b/public/images/flags/shiny/32/Cape-Verde-Islands.png
similarity index 100%
rename from public/images/flags/shiny/32/Cape-Verde.png
rename to public/images/flags/shiny/32/Cape-Verde-Islands.png
diff --git a/public/images/flags/shiny/32/Macedonia.png b/public/images/flags/shiny/32/FYR-Macedonia.png
similarity index 100%
rename from public/images/flags/shiny/32/Macedonia.png
rename to public/images/flags/shiny/32/FYR-Macedonia.png
diff --git a/public/images/flags/shiny/48/Cape-Verde.png b/public/images/flags/shiny/48/Cape-Verde-Islands.png
similarity index 100%
rename from public/images/flags/shiny/48/Cape-Verde.png
rename to public/images/flags/shiny/48/Cape-Verde-Islands.png
diff --git a/public/images/flags/shiny/48/Macedonia.png b/public/images/flags/shiny/48/FYR-Macedonia.png
similarity index 100%
rename from public/images/flags/shiny/48/Macedonia.png
rename to public/images/flags/shiny/48/FYR-Macedonia.png
diff --git a/public/images/flags/shiny/64/Cape-Verde.png b/public/images/flags/shiny/64/Cape-Verde-Islands.png
similarity index 100%
rename from public/images/flags/shiny/64/Cape-Verde.png
rename to public/images/flags/shiny/64/Cape-Verde-Islands.png
diff --git a/public/images/flags/shiny/64/Macedonia.png b/public/images/flags/shiny/64/FYR-Macedonia.png
similarity index 100%
rename from public/images/flags/shiny/64/Macedonia.png
rename to public/images/flags/shiny/64/FYR-Macedonia.png
diff --git a/public/images/flags/shiny/icns/Cape-Verde.icns b/public/images/flags/shiny/icns/Cape-Verde-Islands.icns
similarity index 100%
rename from public/images/flags/shiny/icns/Cape-Verde.icns
rename to public/images/flags/shiny/icns/Cape-Verde-Islands.icns
diff --git a/public/images/flags/shiny/icns/Macedonia.icns b/public/images/flags/shiny/icns/FYR-Macedonia.icns
similarity index 100%
rename from public/images/flags/shiny/icns/Macedonia.icns
rename to public/images/flags/shiny/icns/FYR-Macedonia.icns
diff --git a/public/images/flags/shiny/ico/Cape-Verde.ico b/public/images/flags/shiny/ico/Cape-Verde-Islands.ico
similarity index 100%
rename from public/images/flags/shiny/ico/Cape-Verde.ico
rename to public/images/flags/shiny/ico/Cape-Verde-Islands.ico
diff --git a/public/images/flags/shiny/ico/Macedonia.ico b/public/images/flags/shiny/ico/FYR-Macedonia.ico
similarity index 100%
rename from public/images/flags/shiny/ico/Macedonia.ico
rename to public/images/flags/shiny/ico/FYR-Macedonia.ico