diff --git a/js/background.js b/js/background.js
index d3d05c6267..c8d3fb91c3 100644
--- a/js/background.js
+++ b/js/background.js
@@ -7,6 +7,7 @@
 
 /* global ConversationController: false */
 /* global getAccountManager: false */
+/* global Signal: false */
 /* global storage: false */
 /* global textsecure: false */
 /* global Whisper: false */
@@ -15,7 +16,7 @@
 ;(function() {
     'use strict';
 
-    const { Message } = window.Whisper.Types;
+    const { Message } = window.Signal.Types;
 
     // Implicitly used in `indexeddb-backbonejs-adapter`:
     // https://github.com/signalapp/Signal-Desktop/blob/4033a9f8137e62ed286170ed5d4941982b1d3a64/components/indexeddb-backbonejs-adapter/backbone-indexeddb.js#L569
diff --git a/js/models/conversations.js b/js/models/conversations.js
index 63005575cc..431f488a63 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -1,5 +1,6 @@
 /* eslint-disable */
 
+/* global Signal: false */
 /* global storage: false */
 /* global textsecure: false */
 /* global Whisper: false */
@@ -8,7 +9,7 @@
   'use strict';
    window.Whisper = window.Whisper || {};
 
-   const { Attachment, Message } = window.Whisper.Types;
+   const { Attachment, Message } = window.Signal.Types;
 
    // TODO: Factor out private and group subclasses of Conversation
 
diff --git a/preload.js b/preload.js
index 399978feb0..5735a42e72 100644
--- a/preload.js
+++ b/preload.js
@@ -76,10 +76,10 @@
   window.autoOrientImage = autoOrientImage;
 
   // ES2015+ modules
-  window.Whisper = window.Whisper || {};
-  window.Whisper.Types = window.Whisper.Types || {};
-  window.Whisper.Types.Attachment = require('./js/modules/types/attachment');
-  window.Whisper.Types.Message = require('./js/modules/types/message');
+  window.Signal = window.Signal || {};
+  window.Signal.Types = window.Signal.Types || {};
+  window.Signal.Types.Attachment = require('./js/modules/types/attachment');
+  window.Signal.Types.Message = require('./js/modules/types/message');
 
   // We pull this in last, because the native module involved appears to be sensitive to
   //   /tmp mounted as noexec on Linux.