diff --git a/dev/data/manifest-variants.json b/dev/data/manifest-variants.json
index 3bb17029..9d7c74d4 100644
--- a/dev/data/manifest-variants.json
+++ b/dev/data/manifest-variants.json
@@ -25,7 +25,7 @@
                 "128": "images/icon128.png"
             },
             "default_title": "Yomichan",
-            "default_popup": "context.html"
+            "default_popup": "action-popup.html"
         },
         "background": {
             "page": "background.html",
@@ -111,7 +111,7 @@
             }
         },
         "web_accessible_resources": [
-            "float.html",
+            "popup.html",
             "template-renderer.html"
         ],
         "content_security_policy": "default-src 'self'; style-src 'self' 'unsafe-inline'; media-src *; connect-src *"
diff --git a/ext/context.html b/ext/action-popup.html
similarity index 100%
rename from ext/context.html
rename to ext/action-popup.html
diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index b920caf7..75b74257 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -256,7 +256,7 @@ class Popup extends EventDispatcher {
             frame.removeAttribute('srcdoc');
             this._observeFullscreen(true);
             this._onFullscreenChanged();
-            const url = chrome.runtime.getURL('/float.html');
+            const url = chrome.runtime.getURL('/popup.html');
             if (useSecurePopupFrameUrl) {
                 frame.contentDocument.location.href = url;
             } else {
diff --git a/ext/manifest.json b/ext/manifest.json
index 233df081..c8178143 100644
--- a/ext/manifest.json
+++ b/ext/manifest.json
@@ -24,7 +24,7 @@
             "128": "images/icon128.png"
         },
         "default_title": "Yomichan",
-        "default_popup": "context.html"
+        "default_popup": "action-popup.html"
     },
     "background": {
         "page": "background.html",
@@ -110,7 +110,7 @@
         }
     },
     "web_accessible_resources": [
-        "float.html",
+        "popup.html",
         "template-renderer.html"
     ],
     "content_security_policy": "default-src 'self'; style-src 'self' 'unsafe-inline'; media-src *; connect-src *"
diff --git a/ext/float.html b/ext/popup.html
similarity index 100%
rename from ext/float.html
rename to ext/popup.html