diff --git a/web/.gitmodules b/web/.gitmodules
index c4347a2c6b5..b1629443b7a 100644
--- a/web/.gitmodules
+++ b/web/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "packages/e"]
-	path = packages/e
+[submodule "packages/webapps.e"]
+	path = packages/webapps.e
 	url = git@github.com:gravitational/webapps.e.git
diff --git a/web/Dockerfile b/web/Dockerfile
index 9b70488ba4b..8f3537cc3ce 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -11,8 +11,8 @@ COPY packages/design/package.json web-apps/packages/design/
 COPY packages/gravity/package.json web-apps/packages/gravity/
 COPY packages/shared/package.json web-apps/packages/shared/
 COPY packages/teleport/package.json web-apps/packages/teleport/
-COPY packages/e/gravity/package.json web-apps/packages/e/gravity/
-COPY packages/e/teleport/package.json web-apps/packages/e/teleport/
+COPY packages/webapps.e/gravity/package.json web-apps/packages/webapps.e/gravity/
+COPY packages/webapps.e/teleport/package.json web-apps/packages/webapps.e/teleport/
 WORKDIR web-apps
 RUN yarn install
 COPY  . .
diff --git a/web/Makefile b/web/Makefile
index d5a9941461d..a7b549242f9 100644
--- a/web/Makefile
+++ b/web/Makefile
@@ -13,11 +13,11 @@ teleport:
 
 .PHONY:teleport-e
 teleport-e:
-	$(MAKE) docker-build PACKAGE_PATH=packages/e/teleport NPM_CMD=build-teleport-e
+	$(MAKE) docker-build PACKAGE_PATH=packages/webapps.e/teleport NPM_CMD=build-teleport-e
 
 .PHONY:gravity-e
 gravity-e:
-	$(MAKE) docker-build PACKAGE_PATH=packages/e/gravity NPM_CMD=build-gravity-e
+	$(MAKE) docker-build PACKAGE_PATH=packages/webapps.e/gravity NPM_CMD=build-gravity-e
 
 .PHONY:docker-enter
 docker-enter:
diff --git a/web/jest.config.js b/web/jest.config.js
index ae1a1b45bec..bae7ce3d9e9 100644
--- a/web/jest.config.js
+++ b/web/jest.config.js
@@ -4,8 +4,8 @@ module.exports = {
     'design/(.*)$': '<rootDir>/packages/design/src/$1',
     'gravity/(.*)$': '<rootDir>/packages/gravity/src/$1',
     'teleport/(.*)$': '<rootDir>/packages/teleport/src/$1',
-    'e-teleport/(.*)$': '<rootDir>/packages/e/teleport/src/$1',
-    'e-shared/(.*)$': '<rootDir>/packages/e/shared/$1',
-    'e-gravity/(.*)$': '<rootDir>/packages/e/gravity/$1',
+    'e-teleport/(.*)$': '<rootDir>/packages/webapps.e/teleport/src/$1',
+    'e-shared/(.*)$': '<rootDir>/packages/webapps.e/shared/$1',
+    'e-gravity/(.*)$': '<rootDir>/packages/webapps.e/gravity/$1',
   },
 };
diff --git a/web/jsconfig.json b/web/jsconfig.json
index bb9a039782a..1220a7a720d 100644
--- a/web/jsconfig.json
+++ b/web/jsconfig.json
@@ -9,9 +9,9 @@
         "design": ["packages/design/src/"],
         "teleport/*": ["packages/teleport/src/*"],
         "gravity/*": ["packages/gravity/src/*"],
-        "e-gravity/*": ["packages/e/gravity/src/*"],
-        "e-teleport/*": ["packages/e/teleport/src/*"],
-        "e-shared/*": ["packages/e/shared/src/*"]
+        "e-gravity/*": ["packages/webapps.e/gravity/src/*"],
+        "e-teleport/*": ["packages/webapps.e/teleport/src/*"],
+        "e-shared/*": ["packages/webapps.e/shared/src/*"]
       }
     },
     "include": [
diff --git a/web/packages/build/webpack/webpack.base.js b/web/packages/build/webpack/webpack.base.js
index 203939adad4..9fce29148d4 100644
--- a/web/packages/build/webpack/webpack.base.js
+++ b/web/packages/build/webpack/webpack.base.js
@@ -61,9 +61,9 @@ module.exports = function createConfig() {
       alias: {
         jQuery: 'jquery',
         teleport: path.join(__dirname, '/../../teleport/src'),
-        'e-teleport': path.join(__dirname, '/../../e/teleport/src'),
-        'e-shared': path.join(__dirname, '/../../e/shared/src'),
-        'e-gravity': path.join(__dirname, '/../../e/gravity/src'),
+        'e-teleport': path.join(__dirname, '/../../webapps.e/teleport/src'),
+        'e-shared': path.join(__dirname, '/../../webapps.e/shared/src'),
+        'e-gravity': path.join(__dirname, '/../../webapps.e/gravity/src'),
         design: path.join(__dirname, '/../../design/src'),
         shared: path.join(__dirname, '/../../shared'),
         gravity: path.join(__dirname, '/../../gravity/src'),
diff --git a/web/packages/e b/web/packages/webapps.e
similarity index 100%
rename from web/packages/e
rename to web/packages/webapps.e
diff --git a/web/tsconfig.json b/web/tsconfig.json
index 7ac5eca39f7..2acf948e26d 100644
--- a/web/tsconfig.json
+++ b/web/tsconfig.json
@@ -10,9 +10,9 @@
       "design": ["packages/design/src/"],
       "teleport/*": ["packages/teleport/src/*"],
       "gravity/*": ["packages/gravity/src/*"],
-      "e-gravity/*": ["packages/e/gravity/src/*"],
-      "e-teleport/*": ["packages/e/teleport/src/*"],
-      "e-shared/*": ["packages/e/shared/src/*"]
+      "e-gravity/*": ["packages/webapps.e/gravity/src/*"],
+      "e-teleport/*": ["packages/webapps.e/teleport/src/*"],
+      "e-shared/*": ["packages/webapps.e/shared/src/*"]
     },
     // Process & infer types from .js files.
     "allowJs": true,