diff --git a/.eslintrc.js b/.eslintrc.js
index 188fee87c2..5c1c881c9e 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -215,7 +215,6 @@ module.exports = {
                 'LiveTvHelpers': 'writable',
                 'Loading': 'writable',
                 'MetadataEditor': 'writable',
-                'PlaylistViewer': 'writable',
                 'ServerNotifications': 'writable',
                 'TaskButton': 'writable',
                 'UserParentalControlPage': 'writable',
diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js
index ad8bbb063e..eb8c91f09b 100644
--- a/src/controllers/itemDetails/index.js
+++ b/src/controllers/itemDetails/index.js
@@ -1507,13 +1507,13 @@ function renderChildren(page, item) {
 }
 
 function renderItemsByName(page, item) {
-    import('../../scripts/itembynamedetailpage').then(() => {
-        window.ItemsByName.renderItems(page, item);
+    import('../../scripts/itemsByName').then(({ default: ItemsByName }) => {
+        ItemsByName.renderItems(page, item);
     });
 }
 
 function renderPlaylistItems(page, item) {
-    import('../../scripts/playlistedit').then(() => {
+    import('../../scripts/playlistViewer').then(({ default: PlaylistViewer }) => {
         PlaylistViewer.render(page, item);
     });
 }
diff --git a/src/scripts/itembynamedetailpage.js b/src/scripts/itemsByName.js
similarity index 98%
rename from src/scripts/itembynamedetailpage.js
rename to src/scripts/itemsByName.js
index 3fb575bc42..b0ead111d2 100644
--- a/src/scripts/itembynamedetailpage.js
+++ b/src/scripts/itemsByName.js
@@ -89,11 +89,11 @@ function renderItems(page, item) {
     const sectionElems = elem.querySelectorAll('.verticalSection');
 
     for (let i = 0, length = sectionElems.length; i < length; i++) {
-        renderSection(page, item, sectionElems[i], sectionElems[i].getAttribute('data-type'));
+        renderSection(item, sectionElems[i], sectionElems[i].getAttribute('data-type'));
     }
 }
 
-function renderSection(page, item, element, type) {
+function renderSection(item, element, type) {
     switch (type) {
         case 'Program':
             loadItems(element, item, type, {
@@ -373,6 +373,8 @@ function getItemsFunction(options, item) {
     };
 }
 
-window.ItemsByName = {
-    renderItems: renderItems
+const ItemsByName = {
+    renderItems
 };
+
+export default ItemsByName;
diff --git a/src/scripts/playlistedit.js b/src/scripts/playlistViewer.js
similarity index 75%
rename from src/scripts/playlistedit.js
rename to src/scripts/playlistViewer.js
index 7b6b05b291..16844ee8c8 100644
--- a/src/scripts/playlistedit.js
+++ b/src/scripts/playlistViewer.js
@@ -35,14 +35,18 @@ function init(page, item) {
     elem.getItemsHtml = getItemsHtmlFn(item.Id);
 }
 
-window.PlaylistViewer = {
-    render: function (page, item) {
-        if (!page.playlistInit) {
-            page.playlistInit = true;
-            init(page, item);
-        }
-
-        page.querySelector('#childrenContent').classList.add('verticalSection-extrabottompadding');
-        page.querySelector('#childrenContent .itemsContainer').refreshItems();
+function render(page, item) {
+    if (!page.playlistInit) {
+        page.playlistInit = true;
+        init(page, item);
     }
+
+    page.querySelector('#childrenContent').classList.add('verticalSection-extrabottompadding');
+    page.querySelector('#childrenContent .itemsContainer').refreshItems();
+}
+
+const PlaylistViewer = {
+    render
 };
+
+export default PlaylistViewer;