diff --git a/LesionTracker/client/components/viewer/viewer.js b/LesionTracker/client/components/viewer/viewer.js
index 9a9da3b7f..07c407b06 100644
--- a/LesionTracker/client/components/viewer/viewer.js
+++ b/LesionTracker/client/components/viewer/viewer.js
@@ -13,7 +13,7 @@ Session.set('TimepointsReady', false);
 Session.set('MeasurementsReady', false);
 
 Template.viewer.onCreated(() => {
-    const toolManager = Viewerbase.toolManager;
+    const toolManager = OHIF.viewerbase.toolManager;
     ViewerData = window.ViewerData || ViewerData;
 
     const instance = Template.instance();
@@ -69,7 +69,7 @@ Template.viewer.onCreated(() => {
 
     instance.data.studies.forEach(study => {
         study.selected = true;
-        study.displaySets = Viewerbase.createStacks(study);
+        study.displaySets = OHIF.viewerbase.createStacks(study);
         ViewerStudies.insert(study);
     });
 
diff --git a/OHIFViewer/client/components/viewer/viewer.js b/OHIFViewer/client/components/viewer/viewer.js
index 08d69725c..c4f374dcf 100644
--- a/OHIFViewer/client/components/viewer/viewer.js
+++ b/OHIFViewer/client/components/viewer/viewer.js
@@ -54,7 +54,7 @@ Template.viewer.onCreated(() => {
     ViewerData[contentId].studyInstanceUids = [];
     instance.data.studies.forEach(study => {
         study.selected = true;
-        study.displaySets = Viewerbase.createStacks(study);
+        study.displaySets = OHIF.viewerbase.createStacks(study);
         // const studyMetadata = new OHIF.metadata.StudyMetadata(study);
         // study.displaySets = OHIF.viewerbase.sortingManager.getDisplaySets(studyMetadata);
         ViewerStudies.insert(study);