diff --git a/scripts/generate-manifest.js b/scripts/generate-manifest.js
index 5e9b9320..fd520a88 100644
--- a/scripts/generate-manifest.js
+++ b/scripts/generate-manifest.js
@@ -32,7 +32,7 @@ const manifest = {
   },
   content_scripts: [
     {
-      js: ['message-bus.js'],
+      js: ['content-script.js'],
       matches: ['*://*/*'],
     },
   ],
diff --git a/src/background/background.ts b/src/background/background.ts
index 7acdedf0..05cdf8ad 100755
--- a/src/background/background.ts
+++ b/src/background/background.ts
@@ -4,7 +4,7 @@
   performs the instructed logic. An effective background script is only loaded when it is
   needed and unloaded when it goes idle.
  */
-import { popupCenter } from 'background/popup';
+import { popupCenter } from '@background/popup';
 import { ScreenPaths } from '@store/types';
 import { storePayload, StorageKey } from '../storage';
 import { vaultMessageHandler } from '@background/vault';
diff --git a/src/background/vault.ts b/src/background/vault.ts
index b61a7f5d..9d6ffac2 100644
--- a/src/background/vault.ts
+++ b/src/background/vault.ts
@@ -10,7 +10,7 @@ import {
 
 import { gaiaUrl } from '@common/constants';
 import { VaultActions } from '@background/vault-types';
-import { decryptMnemonic, encryptMnemonic } from 'background/crypto/mnemonic-encryption';
+import { decryptMnemonic, encryptMnemonic } from '@background/crypto/mnemonic-encryption';
 import { DEFAULT_PASSWORD } from '@store/types';
 import { InternalMethods } from '@content-scripts/message-types';
 
diff --git a/src/common/hooks/callbacks/use-save-auth-request-callback.ts b/src/common/hooks/callbacks/use-save-auth-request-callback.ts
index dd75b7d5..4ed1910e 100644
--- a/src/common/hooks/callbacks/use-save-auth-request-callback.ts
+++ b/src/common/hooks/callbacks/use-save-auth-request-callback.ts
@@ -1,13 +1,14 @@
-import { useLocation } from 'react-router-dom';
 import { useCallback, useEffect } from 'react';
+import { useLocation } from 'react-router-dom';
+import { useSetRecoilState } from 'recoil';
 import { decodeToken } from 'jsontokens';
-import { getRequestOrigin, StorageKey } from 'storage';
+
 import { DecodedAuthRequest } from '@common/dev/types';
 import { useWallet } from '@common/hooks/use-wallet';
-import { ScreenPaths } from '@store/types';
-import { useOnboardingState } from '../use-onboarding-state';
-import { useSetRecoilState } from 'recoil';
 import { authRequestState, currentScreenState } from '@store/onboarding';
+import { ScreenPaths } from '@store/types';
+import { getRequestOrigin, StorageKey } from '../../../storage';
+import { useOnboardingState } from '../use-onboarding-state';
 
 export function useSaveAuthRequest() {
   const { wallet } = useWallet();
diff --git a/src/common/hooks/use-origin.ts b/src/common/hooks/use-origin.ts
index d877a03a..8df2fde8 100644
--- a/src/common/hooks/use-origin.ts
+++ b/src/common/hooks/use-origin.ts
@@ -1,6 +1,6 @@
-import { getRequestOrigin, StorageKey } from 'storage';
 import { useRecoilValue } from 'recoil';
 import { requestTokenStore } from '@store/transaction';
+import { getRequestOrigin, StorageKey } from '../../storage';
 
 export function useOrigin() {
   const requestToken = useRecoilValue(requestTokenStore);
diff --git a/src/common/utils.ts b/src/common/utils.ts
index 68fa0dc1..f10cb518 100644
--- a/src/common/utils.ts
+++ b/src/common/utils.ts
@@ -2,7 +2,7 @@ import React from 'react';
 import { DecodedAuthRequest } from './dev/types';
 import { wordlists } from 'bip39';
 import { isValidUrl } from './validate-url';
-import { getTab, deleteTabForRequest, StorageKey } from 'storage';
+import { getTab, deleteTabForRequest, StorageKey } from '../storage';
 import { BufferReader, deserializePostCondition, PostCondition } from '@stacks/transactions';
 import { KEBAB_REGEX } from '@common/constants';
 import {
diff --git a/test-app/webpack/dev-server.js b/test-app/webpack/dev-server.js
index 68dbcdbd..4c54f955 100644
--- a/test-app/webpack/dev-server.js
+++ b/test-app/webpack/dev-server.js
@@ -14,7 +14,7 @@ const config = require('./webpack.config.dev');
 
 // This is important, allows for fast refresh to work
 // we don't want to inject our fast refresh helpers into everything
-const excludeEntriesToHotReload = ['message-bus.js'];
+const excludeEntriesToHotReload = ['content-script.js'];
 
 const NODE_ENV = process.env.NODE_ENV;
 const PORT = process.env.PORT || '3000';