diff --git a/modules/alloy/Gruntfile.js b/modules/alloy/Gruntfile.js
index f27d39eb32..69c368de69 100644
--- a/modules/alloy/Gruntfile.js
+++ b/modules/alloy/Gruntfile.js
@@ -1,7 +1,7 @@
 const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
 const TsConfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
 const path = require('path');
-const swag = require('@hugemce/swag');
+const swag = require('@ephox/swag');
 
 const create = (inFile, outFile) => {
   const tsConfig = "tsconfig.json";
@@ -41,7 +41,7 @@ const create = (inFile, outFile) => {
         },
         {
           test: /\.js$|\.ts$/,
-          use: ['@hugemce/swag/webpack/remapper']
+          use: ['@ephox/swag/webpack/remapper']
         },
         {
           test: /\.ts$/,
@@ -130,7 +130,7 @@ module.exports = (grunt) => {
   require('load-grunt-tasks')(grunt, {
     requireResolution: true,
     config: "../../package.json",
-    pattern: ['grunt-*', '@ephox/bedrock', '@hugemce/swag']
+    pattern: ['grunt-*', '@ephox/bedrock', '@ephox/swag']
   });
 
   grunt.registerTask('dev', ['webpack-dev-server']);
diff --git a/modules/tinymce/Gruntfile.js b/modules/tinymce/Gruntfile.js
index d9a362b10f..89669ed376 100644
--- a/modules/tinymce/Gruntfile.js
+++ b/modules/tinymce/Gruntfile.js
@@ -7,7 +7,7 @@ const FilesAsStrings = PluginString({
 let zipUtils = require('./tools/modules/zip-helper');
 let gruntUtils = require('./tools/modules/grunt-utils');
 let gruntWebPack = require('./tools/modules/grunt-webpack');
-let swag = require('@hugemce/swag');
+let swag = require('@ephox/swag');
 let path = require('path');
 
 let plugins = [
@@ -916,7 +916,7 @@ module.exports = function (grunt) {
   require('load-grunt-tasks')(grunt, {
     requireResolution: true,
     config: "../../package.json",
-    pattern: ['grunt-*', '@ephox/bedrock-server', '@hugemce/swag']
+    pattern: ['grunt-*', '@ephox/bedrock-server', '@ephox/swag']
   });
   grunt.loadTasks('tools/tasks');
 
diff --git a/modules/tinymce/tools/modules/grunt-webpack.js b/modules/tinymce/tools/modules/grunt-webpack.js
index 1933933c81..fd7b74b674 100644
--- a/modules/tinymce/tools/modules/grunt-webpack.js
+++ b/modules/tinymce/tools/modules/grunt-webpack.js
@@ -61,7 +61,7 @@ let create = (entries, tsConfig, outDir = '.') => {
         },
         {
           test: /\.(js|mjs|ts)$/,
-          use: [ '@hugemce/swag/webpack/remapper' ]
+          use: [ '@ephox/swag/webpack/remapper' ]
         },
         {
           test: /\.ts$/,