diff --git a/src/components/apiInput/package.json b/src/components/apiInput/package.json
deleted file mode 100644
index 6c542951b2..0000000000
--- a/src/components/apiInput/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "main": "apiInput.js"
-}
\ No newline at end of file
diff --git a/src/components/apiInput/gamepadtokey.js b/src/components/serverNotifications/gamepadtokey.js
similarity index 100%
rename from src/components/apiInput/gamepadtokey.js
rename to src/components/serverNotifications/gamepadtokey.js
diff --git a/src/components/apiInput/mouseManager.js b/src/components/serverNotifications/mouseManager.js
similarity index 100%
rename from src/components/apiInput/mouseManager.js
rename to src/components/serverNotifications/mouseManager.js
diff --git a/src/components/serverNotifications/package.json b/src/components/serverNotifications/package.json
new file mode 100644
index 0000000000..779da202d2
--- /dev/null
+++ b/src/components/serverNotifications/package.json
@@ -0,0 +1,3 @@
+{
+    "main": "serverNotifications.js"
+}
\ No newline at end of file
diff --git a/src/components/apiInput/apiInput.js b/src/components/serverNotifications/serverNotifications.js
similarity index 98%
rename from src/components/apiInput/apiInput.js
rename to src/components/serverNotifications/serverNotifications.js
index 388fb11beb..2537723b68 100644
--- a/src/components/apiInput/apiInput.js
+++ b/src/components/serverNotifications/serverNotifications.js
@@ -248,10 +248,10 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus
     });
 
     if (!enableNativeGamepadKeyMapping() && isGamepadSupported()) {
-        require(["components/apiInput/gamepadtokey"]);
+        require(["components/serverNotifications/gamepadtokey"]);
     }
 
-    require(["components/apiInput/mouseManager"]);
+    require(["components/serverNotifications/mouseManager"]);
 
     return serverNotifications;
 });
diff --git a/src/scripts/site.js b/src/scripts/site.js
index f8e348b5ab..f4574c36f8 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -873,7 +873,7 @@ var AppInfo = {};
         define("fnchecked", ["legacy/fnchecked"], returnFirstDependency);
         define("dialogHelper", [componentsPath + "/dialogHelper/dialogHelper"], returnFirstDependency);
         define("inputmanager", ["inputManager"], returnFirstDependency);
-        define("serverNotifications", [componentsPath + "/apiInput/apiInput"], returnFirstDependency);
+        define("serverNotifications", [componentsPath + "/serverNotifications/serverNotifications"], returnFirstDependency);
         define("appFooter-shared", ["appFooter"], createSharedAppFooter);
         define("skinManager", [componentsPath + "/skinManager"], returnFirstDependency);
         define("connectionManager", [], function () {