diff --git a/api/chalicelib/core/__init__.py b/api/chalicelib/core/__init__.py
index ee17d1efa..4b886c17e 100644
--- a/api/chalicelib/core/__init__.py
+++ b/api/chalicelib/core/__init__.py
@@ -3,8 +3,8 @@ import logging
 
 logging.basicConfig(level=config("LOGLEVEL", default=logging.INFO))
 
-if config("EXP_CH_LAYER", cast=bool, default=True):
-    from . import metrics_ch as metrics
-    from . import metrics as metrics_legacy
+if config("EXP_AUTOCOMPLETE", cast=bool, default=False):
+    logging.info(">>> Using experimental autocomplete")
+    from . import autocomplete_exp as autocomplete
 else:
-    from . import metrics
+    from . import autocomplete as autocomplete
diff --git a/ee/api/chalicelib/core/autocomplete_exp.py b/api/chalicelib/core/autocomplete_exp.py
similarity index 100%
rename from ee/api/chalicelib/core/autocomplete_exp.py
rename to api/chalicelib/core/autocomplete_exp.py
diff --git a/api/env.default b/api/env.default
index 4e52e5c57..5340e1f13 100644
--- a/api/env.default
+++ b/api/env.default
@@ -71,4 +71,4 @@ sourcemaps_reader=http://sourcemapreader-openreplay.app.svc.cluster.local:9000/s
 STAGE=default-foss
 TZ=UTC
 EXP_CH_DRIVER=true
-EXP_CH_LAYER=true
\ No newline at end of file
+EXP_AUTOCOMPLETE=true
\ No newline at end of file
diff --git a/ee/api/.gitignore b/ee/api/.gitignore
index f1acae182..9cef962d6 100644
--- a/ee/api/.gitignore
+++ b/ee/api/.gitignore
@@ -189,13 +189,13 @@ Pipfile.lock
 /chalicelib/core/assist.py
 /chalicelib/core/authorizers.py
 /chalicelib/core/autocomplete.py
+/chalicelib/core/autocomplete_exp.py
 /chalicelib/core/canvas.py
 /chalicelib/core/collaboration_base.py
 /chalicelib/core/collaboration_msteams.py
 /chalicelib/core/collaboration_slack.py
 /chalicelib/core/countries.py
 /chalicelib/core/metrics.py
-/chalicelib/core/metrics_ch.py
 /chalicelib/core/custom_metrics.py
 /chalicelib/core/custom_metrics_predefined.py
 /chalicelib/core/dashboards.py
diff --git a/api/chalicelib/core/metrics_ch.py b/ee/api/chalicelib/core/metrics_ch.py
similarity index 100%
rename from api/chalicelib/core/metrics_ch.py
rename to ee/api/chalicelib/core/metrics_ch.py
diff --git a/ee/api/clean-dev.sh b/ee/api/clean-dev.sh
index a56afff7b..df5176eef 100755
--- a/ee/api/clean-dev.sh
+++ b/ee/api/clean-dev.sh
@@ -11,12 +11,12 @@ rm -rf ./chalicelib/core/announcements.py
 rm -rf ./chalicelib/core/assist.py
 rm -rf ./chalicelib/core/authorizers.py
 rm -rf ./chalicelib/core/autocomplete.py
+rm -rf ./chalicelib/core/autocomplete_exp.py
 rm -rf ./chalicelib/core/collaboration_base.py
 rm -rf ./chalicelib/core/collaboration_msteams.py
 rm -rf ./chalicelib/core/collaboration_slack.py
 rm -rf ./chalicelib/core/countries.py
 rm -rf ./chalicelib/core/metrics.py
-rm -rf ./chalicelib/core/metrics_ch.py
 rm -rf ./chalicelib/core/custom_metrics.py
 rm -rf ./chalicelib/core/custom_metrics_predefined.py
 rm -rf ./chalicelib/core/dashboards.py