diff --git a/plex/pmm/collections/countries/movies.yml b/plex/pmm/collections/countries/movies.yml
index 8c98fea..aaf3936 100644
--- a/plex/pmm/collections/countries/movies.yml
+++ b/plex/pmm/collections/countries/movies.yml
@@ -26,4 +26,4 @@ dynamic_collections:
       Bolivarian Republic of Venezuela: Venezuela
       Republic of Korea: South Korea
     template:
-      - Per_Country_Movies
+      - Per_Country
diff --git a/plex/pmm/collections/countries/shows.yml b/plex/pmm/collections/countries/shows.yml
index a61832a..608a359 100644
--- a/plex/pmm/collections/countries/shows.yml
+++ b/plex/pmm/collections/countries/shows.yml
@@ -7,7 +7,23 @@ dynamic_collections:
   ## These get generated in the order they are listed here, so put the more intensive ones at the bottom
 
   Per-Country DC Shows: # mapping name does not matter just needs to be unique
-    type: origin_country
+    type: country
     title_format: <<key_name>>
+    key_name_override:
+      Plurinational State of Bolivia: Bolivia
+      Russian Federation: Russia
+      Taiwan, Province of China: Taiwan
+      Turks and Caicos Islands: Turks and Caicos
+      Syrian Arab Republic: Syria
+      Viet Nam: Vietnam
+      State of Palestine: Palestine
+      Republic of North Macedonia: North Macedonia
+      Papua New Guinea: Guinea
+      Lao People's Democratic Republic: Lao
+      Islamic Republic of Iran: Iran
+      French Polynesia: Polynesia
+      Federated States of Micronesia: Micronesia
+      Bolivarian Republic of Venezuela: Venezuela
+      Republic of Korea: South Korea
     template:
-      - Per_Country_Shows
+      - Per_Country
diff --git a/plex/pmm/templates/dynamic_collections.yml b/plex/pmm/templates/dynamic_collections.yml
index ef53e83..520a062 100644
--- a/plex/pmm/templates/dynamic_collections.yml
+++ b/plex/pmm/templates/dynamic_collections.yml
@@ -36,7 +36,7 @@ templates:
       - weekly(monday)
       - weekly(thursday)
 
-  Per_Country_Movies:
+  Per_Country:
     smart_filter:
       limit: 10000
       sort_by: critic_rating.desc
@@ -52,19 +52,3 @@ templates:
     schedule:
       - weekly(saturday)
 
-  Per_Country_Shows:
-    smart_filter:
-      limit: 10000
-      sort_by: critic_rating.desc
-      any:
-        origin_country: <<value>>
-    default:
-      level: ""
-    sort_title: 110_+<<level>>_<<key_name>>
-    url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/country/white/<<key_name>>.jpg
-    visible_library: false
-    visible_shared: false
-    visible_home: false
-    schedule:
-      - weekly(saturday)
-