diff --git a/js/background.js b/js/background.js
index ed5e0667de1..f11480993e1 100644
--- a/js/background.js
+++ b/js/background.js
@@ -14,7 +14,7 @@
 ;(function() {
     'use strict';
 
-    const { IdleDetector, MessageMigration } = Signal;
+    const { IdleDetector, MessageDataMigrator } = Signal.Workflow;
     const { Errors, Message } = window.Signal.Types;
     const { upgradeMessageSchema } = window.Signal.Migrations;
 
@@ -77,11 +77,11 @@
     storage.fetch();
 
 
-    /* eslint-enable */
+  /* eslint-enable */
   /* jshint ignore:start */
   const idleDetector = new IdleDetector();
   idleDetector.on('idle', async () => {
-    const results = await MessageMigration.processNext({
+    const results = await MessageDataMigrator.processNext({
       BackboneMessage: Whisper.Message,
       BackboneMessageCollection: Whisper.MessageCollection,
       count: 3,
diff --git a/js/modules/messages_migration.js b/js/modules/messages_data_migrator.js
similarity index 100%
rename from js/modules/messages_migration.js
rename to js/modules/messages_data_migrator.js
diff --git a/preload.js b/preload.js
index 7a8defd34c7..3528fc75fce 100644
--- a/preload.js
+++ b/preload.js
@@ -125,23 +125,25 @@
   const { IdleDetector} = require('./js/modules/idle_detector');
 
   window.Signal = window.Signal || {};
-  window.Signal.IdleDetector = IdleDetector;
-  window.Signal.Logs = require('./js/modules/logs');
-  window.Signal.MessageMigration = require('./js/modules/messages_migration');
-  window.Signal.OS = require('./js/modules/os');
   window.Signal.Backup = require('./js/modules/backup');
   window.Signal.Crypto = require('./js/modules/crypto');
+  window.Signal.Logs = require('./js/modules/logs');
   window.Signal.Migrations = {};
   window.Signal.Migrations.loadAttachmentData = Attachment.loadData(readAttachmentData);
   window.Signal.Migrations.deleteAttachmentData = Attachment.deleteData(deleteAttachmentData);
   window.Signal.Migrations.upgradeMessageSchema = upgradeMessageSchema;
   window.Signal.Migrations.V17 = require('./js/modules/migrations/17');
+  window.Signal.OS = require('./js/modules/os');
   window.Signal.Types = window.Signal.Types || {};
   window.Signal.Types.Attachment = Attachment;
   window.Signal.Types.Errors = require('./js/modules/types/errors');
   window.Signal.Types.Message = Message;
   window.Signal.Types.MIME = require('./js/modules/types/mime');
   window.Signal.Types.Settings = require('./js/modules/types/settings');
+  window.Signal.Workflow = {};
+  window.Signal.Workflow.IdleDetector = IdleDetector;
+  window.Signal.Workflow.MessageDataMigrator =
+    require('./js/modules/messages_data_migrator');
 
   // We pull this in last, because the native module involved appears to be sensitive to
   //   /tmp mounted as noexec on Linux.