diff --git a/src/UI/Series/Index/List/CollectionView.js b/src/UI/Series/Index/Overview/SeriesOverviewCollectionView.js
similarity index 64%
rename from src/UI/Series/Index/List/CollectionView.js
rename to src/UI/Series/Index/Overview/SeriesOverviewCollectionView.js
index 8f6b5ae7f..986edd574 100644
--- a/src/UI/Series/Index/List/CollectionView.js
+++ b/src/UI/Series/Index/Overview/SeriesOverviewCollectionView.js
@@ -3,12 +3,12 @@
 define(
     [
         'marionette',
-        'Series/Index/List/ItemView'
+        'Series/Index/Overview/SeriesOverviewItemView'
     ], function (Marionette, ListItemView) {
 
         return Marionette.CompositeView.extend({
             itemView         : ListItemView,
             itemViewContainer: '#x-series-list',
-            template         : 'Series/Index/List/CollectionTemplate'
+            template         : 'Series/Index/Overview/SeriesOverviewCollectionViewTemplate'
         });
     });
diff --git a/src/UI/Series/Index/List/CollectionTemplate.html b/src/UI/Series/Index/Overview/SeriesOverviewCollectionViewTemplate.html
similarity index 100%
rename from src/UI/Series/Index/List/CollectionTemplate.html
rename to src/UI/Series/Index/Overview/SeriesOverviewCollectionViewTemplate.html
diff --git a/src/UI/Series/Index/List/ItemView.js b/src/UI/Series/Index/Overview/SeriesOverviewItemView.js
similarity index 89%
rename from src/UI/Series/Index/List/ItemView.js
rename to src/UI/Series/Index/Overview/SeriesOverviewItemView.js
index e6da6377b..1c4970a65 100644
--- a/src/UI/Series/Index/List/ItemView.js
+++ b/src/UI/Series/Index/Overview/SeriesOverviewItemView.js
@@ -6,7 +6,7 @@ define(
         'marionette'
     ], function (vent, Marionette) {
         return Marionette.ItemView.extend({
-            template: 'Series/Index/List/ItemTemplate',
+            template: 'Series/Index/Overview/SeriesOverviewItemViewTemplate',
 
             ui: {
                 'progressbar': '.progress .bar'
diff --git a/src/UI/Series/Index/List/ItemTemplate.html b/src/UI/Series/Index/Overview/SeriesOverviewItemViewTemplate.html
similarity index 100%
rename from src/UI/Series/Index/List/ItemTemplate.html
rename to src/UI/Series/Index/Overview/SeriesOverviewItemViewTemplate.html
diff --git a/src/UI/Series/Index/Posters/CollectionView.js b/src/UI/Series/Index/Posters/SeriesPostersCollectionView.js
similarity index 65%
rename from src/UI/Series/Index/Posters/CollectionView.js
rename to src/UI/Series/Index/Posters/SeriesPostersCollectionView.js
index 06600e8fb..ead7a910a 100644
--- a/src/UI/Series/Index/Posters/CollectionView.js
+++ b/src/UI/Series/Index/Posters/SeriesPostersCollectionView.js
@@ -3,12 +3,12 @@
 define(
     [
         'marionette',
-        'Series/Index/Posters/ItemView'
+        'Series/Index/Posters/SeriesPostersItemView'
     ], function (Marionette, PosterItemView) {
 
         return Marionette.CompositeView.extend({
             itemView         : PosterItemView,
             itemViewContainer: '#x-series-posters',
-            template         : 'Series/Index/Posters/CollectionTemplate'
+            template         : 'Series/Index/Posters/SeriesPostersCollectionViewTemplate'
         });
     });
diff --git a/src/UI/Series/Index/Posters/CollectionTemplate.html b/src/UI/Series/Index/Posters/SeriesPostersCollectionViewTemplate.html
similarity index 100%
rename from src/UI/Series/Index/Posters/CollectionTemplate.html
rename to src/UI/Series/Index/Posters/SeriesPostersCollectionViewTemplate.html
diff --git a/src/UI/Series/Index/Posters/ItemView.js b/src/UI/Series/Index/Posters/SeriesPostersItemView.js
similarity index 93%
rename from src/UI/Series/Index/Posters/ItemView.js
rename to src/UI/Series/Index/Posters/SeriesPostersItemView.js
index 02d4ba713..997c1c9e1 100644
--- a/src/UI/Series/Index/Posters/ItemView.js
+++ b/src/UI/Series/Index/Posters/SeriesPostersItemView.js
@@ -8,7 +8,7 @@ define(
 
         return Marionette.ItemView.extend({
             tagName : 'li',
-            template: 'Series/Index/Posters/ItemTemplate',
+            template: 'Series/Index/Posters/SeriesPostersItemViewTemplate',
 
 
             ui: {
diff --git a/src/UI/Series/Index/Posters/ItemTemplate.html b/src/UI/Series/Index/Posters/SeriesPostersItemViewTemplate.html
similarity index 100%
rename from src/UI/Series/Index/Posters/ItemTemplate.html
rename to src/UI/Series/Index/Posters/SeriesPostersItemViewTemplate.html
diff --git a/src/UI/Series/Index/SeriesIndexLayout.js b/src/UI/Series/Index/SeriesIndexLayout.js
index 3313bca83..ac3262063 100644
--- a/src/UI/Series/Index/SeriesIndexLayout.js
+++ b/src/UI/Series/Index/SeriesIndexLayout.js
@@ -3,8 +3,8 @@ define(
     [
         'marionette',
         'backgrid',
-        'Series/Index/Posters/CollectionView',
-        'Series/Index/List/CollectionView',
+        'Series/Index/Posters/SeriesPostersCollectionView',
+        'Series/Index/Overview/SeriesOverviewCollectionView',
         'Series/Index/EmptyView',
         'Series/SeriesCollection',
         'Cells/RelativeDateCell',