diff --git a/src/bootstrap.js b/src/bootstrap.js
index 7351835..ae6db73 100644
--- a/src/bootstrap.js
+++ b/src/bootstrap.js
@@ -14,6 +14,8 @@ async function startup({ id, version, rootURI }) {
     // Load chrome/content file directly via file:/// URL
     Services.scriptloader.loadSubScript(rootURI + 'chrome/content/utilities.js');
     Services.scriptloader.loadSubScript(rootURI + 'chrome/content/threadpool.js');
+    Services.scriptloader.loadSubScript(rootURI + 'chrome/content/journal.js');
+    Services.scriptloader.loadSubScript(rootURI + 'chrome/content/book.js');
     Services.scriptloader.loadSubScript(rootURI + 'chrome/content/zotmeta.js');
     ZotMeta.init({ id, version, rootURI });
     ZotMeta.addToAllWindows();
diff --git a/src/chrome/content/book.js b/src/chrome/content/book.js
index 2ef6eff..08b4efc 100644
--- a/src/chrome/content/book.js
+++ b/src/chrome/content/book.js
@@ -1,4 +1,4 @@
-ZotMeta.Journal = {
+Book = {
     generateAuthors (author) {
         var newAuthorList = [];
         if (author) {
diff --git a/src/chrome/content/journal.js b/src/chrome/content/journal.js
index 987c229..815779e 100644
--- a/src/chrome/content/journal.js
+++ b/src/chrome/content/journal.js
@@ -1,4 +1,4 @@
-ZotMeta.Journal = {    
+Journal = {    
     generateAuthors (author) {
         var newAuthorList = [];
         if (author) {
diff --git a/src/chrome/content/overlay.xul b/src/chrome/content/overlay.xul
index f9c25c8..04550cd 100644
--- a/src/chrome/content/overlay.xul
+++ b/src/chrome/content/overlay.xul
@@ -5,5 +5,7 @@
     <script src="overlay.js"/>
     <script src="threadpool.js"/>
     <script src="utilities.js"/>
+    <script src="journal.js"/>
+    <script src="book.js"/>
     <script src="zotmeta.js"/>
 </overlay>
diff --git a/src/chrome/content/zotmeta.js b/src/chrome/content/zotmeta.js
index cfc0d60..2e96144 100644
--- a/src/chrome/content/zotmeta.js
+++ b/src/chrome/content/zotmeta.js
@@ -29,7 +29,7 @@ ZotMeta = {
         menuitem.setAttribute('type', 'button');
         menuitem.setAttribute('data-l10n-id', 'update-metadata');
         menuitem.addEventListener('command', () => {
-            ZotMeta.Journal.updateSelectedItemsMetadata();
+            Journal.updateSelectedItemsMetadata();
         });
         doc.getElementById('zotero-itemmenu').appendChild(menuitem);
         this.storeAddedElement(menuitem);