diff --git a/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.hbs b/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.hbs
index 32d765bd3..5fdb04dbe 100644
--- a/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.hbs
+++ b/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.hbs
@@ -89,6 +89,7 @@
                         <ul class="dropdown-menu">
                             {{> MovieTitleNamingPartial}}
                             {{> ReleaseYearNamingPartial}}
+                            {{> TagsNamingPartial}}
                             {{> QualityNamingPartial}}
                             {{> MediaInfoNamingPartial}}
                             {{> ReleaseGroupNamingPartial}}
@@ -118,6 +119,7 @@
                     <ul class="dropdown-menu">
                         {{> MovieTitleNamingPartial}}
                         {{> ReleaseYearNamingPartial}}
+                        {{> TagsNamingPartial}}
                         {{> QualityNamingPartial}}
                         {{> MediaInfoNamingPartial}}
                         {{> ReleaseGroupNamingPartial}}
diff --git a/src/UI/Settings/MediaManagement/Naming/Partials/AbsoluteEpisodeNamingPartial.hbs b/src/UI/Settings/MediaManagement/Naming/Partials/AbsoluteEpisodeNamingPartial.hbs
deleted file mode 100644
index ba31a196e..000000000
--- a/src/UI/Settings/MediaManagement/Naming/Partials/AbsoluteEpisodeNamingPartial.hbs
+++ /dev/null
@@ -1,8 +0,0 @@
-<li class="dropdown-submenu">
-    <a href="#" tabindex="-1" data-token="absolute">Absolute</a>
-    <ul class="dropdown-menu">
-        <li><a href="#" data-token="absolute">1</a></li>
-        <li><a href="#" data-token="absolute:00">01</a></li>
-        <li><a href="#" data-token="absolute:000">001</a></li>
-    </ul>
-</li>
diff --git a/src/UI/Settings/MediaManagement/Naming/Partials/AirDateNamingPartial.hbs b/src/UI/Settings/MediaManagement/Naming/Partials/AirDateNamingPartial.hbs
deleted file mode 100644
index ed845e2c0..000000000
--- a/src/UI/Settings/MediaManagement/Naming/Partials/AirDateNamingPartial.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-<li class="dropdown-submenu">
-    <a href="#" tabindex="-1" data-token="Air-Date">Air-Date</a>
-    <ul class="dropdown-menu">
-        <li><a href="#" data-token="Air-Date">Air-Date</a></li>
-        <li><a href="#" data-token="Air Date">Air Date</a></li>
-        <li><a href="#" data-token="Air.Date">Air.Date</a></li>
-        <li><a href="#" data-token="Air_Date">Air_Date</a></li>
-    </ul>
-</li>
diff --git a/src/UI/Settings/MediaManagement/Naming/Partials/EpisodeNamingPartial.hbs b/src/UI/Settings/MediaManagement/Naming/Partials/EpisodeNamingPartial.hbs
deleted file mode 100644
index 4c20f4ffa..000000000
--- a/src/UI/Settings/MediaManagement/Naming/Partials/EpisodeNamingPartial.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-<li class="dropdown-submenu">
-    <a href="#" tabindex="-1" data-token="episode">Episode</a>
-    <ul class="dropdown-menu">
-        <li><a href="#" data-token="episode">1</a></li>
-        <li><a href="#" data-token="episode:00">01</a></li>
-    </ul>
-</li>
diff --git a/src/UI/Settings/MediaManagement/Naming/Partials/EpisodeTitleNamingPartial.hbs b/src/UI/Settings/MediaManagement/Naming/Partials/EpisodeTitleNamingPartial.hbs
deleted file mode 100644
index 10f2ec67e..000000000
--- a/src/UI/Settings/MediaManagement/Naming/Partials/EpisodeTitleNamingPartial.hbs
+++ /dev/null
@@ -1,11 +0,0 @@
-<li class="dropdown-submenu">
-    <a href="#" tabindex="-1" data-token="Episode Title">Episode Title</a>
-    <ul class="dropdown-menu">
-        <li><a href="#" data-token="Episode Title">Episode Title</a></li>
-        <li><a href="#" data-token="Episode.Title">Episode.Title</a></li>
-        <li><a href="#" data-token="Episode_Title">Episode_Title</a></li>
-        <li><a href="#" data-token="Episode CleanTitle">Episode CleanTitle</a></li>
-        <li><a href="#" data-token="Episode.CleanTitle">Episode.CleanTitle</a></li>
-        <li><a href="#" data-token="Episode_CleanTitle">Episode_CleanTitle</a></li>
-    </ul>
-</li>
diff --git a/src/UI/Settings/MediaManagement/Naming/Partials/SeasonNamingPartial.hbs b/src/UI/Settings/MediaManagement/Naming/Partials/SeasonNamingPartial.hbs
deleted file mode 100644
index 2c56024da..000000000
--- a/src/UI/Settings/MediaManagement/Naming/Partials/SeasonNamingPartial.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-<li class="dropdown-submenu">
-    <a href="#" tabindex="-1" data-token="season">Season</a>
-    <ul class="dropdown-menu">
-        <li><a href="#" data-token="season">1</a></li>
-        <li><a href="#" data-token="season:00">01</a></li>
-    </ul>
-</li>
diff --git a/src/UI/Settings/MediaManagement/Naming/Partials/SeriesTitleNamingPartial.hbs b/src/UI/Settings/MediaManagement/Naming/Partials/SeriesTitleNamingPartial.hbs
deleted file mode 100644
index cc76c95b5..000000000
--- a/src/UI/Settings/MediaManagement/Naming/Partials/SeriesTitleNamingPartial.hbs
+++ /dev/null
@@ -1,11 +0,0 @@
-<li class="dropdown-submenu">
-    <a href="#" tabindex="-1" data-token="Series Title">Series Title</a>
-    <ul class="dropdown-menu">
-        <li><a href="#" data-token="Series Title">Series Title</a></li>
-        <li><a href="#" data-token="Series.Title">Series.Title</a></li>
-        <li><a href="#" data-token="Series_Title">Series_Title</a></li>
-        <li><a href="#" data-token="Series CleanTitle">Series CleanTitle</a></li>
-        <li><a href="#" data-token="Series.CleanTitle">Series.CleanTitle</a></li>
-        <li><a href="#" data-token="Series_CleanTitle">Series_CleanTitle</a></li>
-    </ul>
-</li>
diff --git a/src/UI/Settings/MediaManagement/Naming/Partials/TagsNamingPartial.hbs b/src/UI/Settings/MediaManagement/Naming/Partials/TagsNamingPartial.hbs
new file mode 100644
index 000000000..cfed11970
--- /dev/null
+++ b/src/UI/Settings/MediaManagement/Naming/Partials/TagsNamingPartial.hbs
@@ -0,0 +1,8 @@
+<li class="dropdown-submenu">
+    <a href="#" tabindex="-1" data-token="Tags">Tags</a>
+    <ul class="dropdown-menu">
+        <li><a href="#" data-token="Edition Tags">Edition Tags</a></li>
+        <li><a href="#" data-token="Edition.Tags">Edition.Tags</a></li>
+        <li><a href="#" data-token="Edition_Tags">Edition_Tags</a></li>
+    </ul>
+</li>