diff --git a/api/chalicelib/core/alerts/modules/__init__.py b/api/chalicelib/core/alerts/modules/__init__.py
index 52fc3f0c0..e1794eed7 100644
--- a/api/chalicelib/core/alerts/modules/__init__.py
+++ b/api/chalicelib/core/alerts/modules/__init__.py
@@ -2,8 +2,8 @@ from decouple import config
 
 TENANT_ID = "-1"
 if config("EXP_ALERTS", cast=bool, default=False):
-    from chalicelib.core.sessions import sessions_ch as sessions
+    import chalicelib.core.sessions.sessions_ch as sessions
 else:
-    from chalicelib.core.sessions import sessions
+    import chalicelib.core.sessions.sessions_pg as sessions
 
 from . import helpers as alert_helpers
diff --git a/api/chalicelib/core/errors/modules/__init__.py b/api/chalicelib/core/errors/modules/__init__.py
index 1ef2bd659..6039c07ee 100644
--- a/api/chalicelib/core/errors/modules/__init__.py
+++ b/api/chalicelib/core/errors/modules/__init__.py
@@ -5,6 +5,6 @@ from decouple import config
 logger = logging.getLogger(__name__)
 
 if config("EXP_ERRORS_SEARCH", cast=bool, default=False):
-    from chalicelib.core.sessions import sessions_ch as sessions
+    import chalicelib.core.sessions.sessions_ch as sessions
 else:
-    from chalicelib.core.sessions import sessions
+    import chalicelib.core.sessions.sessions_pg as sessions
diff --git a/api/chalicelib/core/metrics/modules/__init__.py b/api/chalicelib/core/metrics/modules/__init__.py
index 30a6fb567..53858e415 100644
--- a/api/chalicelib/core/metrics/modules/__init__.py
+++ b/api/chalicelib/core/metrics/modules/__init__.py
@@ -5,8 +5,8 @@ from decouple import config
 logger = logging.getLogger(__name__)
 
 if config("EXP_METRICS", cast=bool, default=False):
-    from chalicelib.core.sessions import sessions_ch as sessions
+    import chalicelib.core.sessions.sessions_ch as sessions
 else:
-    from chalicelib.core.sessions import sessions
+    import chalicelib.core.sessions.sessions_pg as sessions
 
 from chalicelib.core.sessions import sessions_mobs
diff --git a/api/chalicelib/core/sessions/__init__.py b/api/chalicelib/core/sessions/__init__.py
index d6e05f166..5d9ffc497 100644
--- a/api/chalicelib/core/sessions/__init__.py
+++ b/api/chalicelib/core/sessions/__init__.py
@@ -3,9 +3,11 @@ import logging
 from decouple import config
 
 logger = logging.getLogger(__name__)
-from . import sessions as sessions_legacy
+from . import sessions_pg
+from . import sessions_pg as sessions_legacy
+from . import sessions_ch
 
 if config("EXP_METRICS", cast=bool, default=False):
     from . import sessions_ch as sessions
 else:
-    from . import sessions
+    from . import sessions_pg as sessions
diff --git a/api/chalicelib/core/sessions/sessions_ch.py b/api/chalicelib/core/sessions/sessions_ch.py
index 23746d373..c0025c31e 100644
--- a/api/chalicelib/core/sessions/sessions_ch.py
+++ b/api/chalicelib/core/sessions/sessions_ch.py
@@ -3,7 +3,7 @@ from typing import List, Union
 
 import schemas
 from chalicelib.core import events, metadata
-from . import performance_event, sessions as sessions_legacy
+from . import performance_event, sessions_legacy
 from chalicelib.utils import pg_client, helper, metrics_helper, ch_client, exp_ch_helper
 from chalicelib.utils import sql_helper as sh
 
diff --git a/api/chalicelib/core/sessions/sessions.py b/api/chalicelib/core/sessions/sessions_pg.py
similarity index 100%
rename from api/chalicelib/core/sessions/sessions.py
rename to api/chalicelib/core/sessions/sessions_pg.py
diff --git a/api/chalicelib/core/sessions/sessions_search.py b/api/chalicelib/core/sessions/sessions_search.py
index 387efde66..6b2bfdaea 100644
--- a/api/chalicelib/core/sessions/sessions_search.py
+++ b/api/chalicelib/core/sessions/sessions_search.py
@@ -2,7 +2,7 @@ import logging
 
 import schemas
 from chalicelib.core import metadata, projects
-from . import sessions_favorite, sessions as sessions_legacy
+from . import sessions_favorite, sessions_legacy
 from chalicelib.utils import pg_client, helper
 
 logger = logging.getLogger(__name__)
diff --git a/ee/api/chalicelib/core/alerts/modules/__init__.py b/ee/api/chalicelib/core/alerts/modules/__init__.py
index f70bca7b7..e84b08b9f 100644
--- a/ee/api/chalicelib/core/alerts/modules/__init__.py
+++ b/ee/api/chalicelib/core/alerts/modules/__init__.py
@@ -3,14 +3,13 @@ from decouple import config
 TENANT_ID = "tenant_id"
 if config("EXP_ALERTS", cast=bool, default=False):
     if config("EXP_SESSIONS_SEARCH", cast=bool, default=False):
-        from chalicelib.core.sessions import sessions
+        import chalicelib.core.sessions.sessions_pg as sessions
     else:
-        from chalicelib.core.sessions import sessions_ch as sessions
+        import chalicelib.core.sessions.sessions_ch as sessions
 else:
     if config("EXP_SESSIONS_SEARCH", cast=bool, default=False):
-        from chalicelib.core.sessions import sessions_ch as sessions
+        import chalicelib.core.sessions.sessions_ch as sessions
     else:
-        from chalicelib.core.sessions import sessions
-
+        import chalicelib.core.sessions.sessions_pg as sessions
 
 from . import helpers as alert_helpers
diff --git a/ee/api/chalicelib/core/sessions/__init__.py b/ee/api/chalicelib/core/sessions/__init__.py
index 121520536..a87d077bf 100644
--- a/ee/api/chalicelib/core/sessions/__init__.py
+++ b/ee/api/chalicelib/core/sessions/__init__.py
@@ -3,12 +3,14 @@ import logging
 from decouple import config
 
 logger = logging.getLogger(__name__)
-from . import sessions as sessions_legacy
+from . import sessions_pg
+from . import sessions_pg as sessions_legacy
+from . import sessions_ch
 
 if config("EXP_SESSIONS_SEARCH", cast=bool, default=False):
     logger.info(">>> Using experimental sessions search")
     from . import sessions_ch as sessions
     from . import sessions_search_exp as sessions_search
 else:
-    from . import sessions
-    from . import sessions_search_exp
+    from . import sessions as sessions
+    from . import sessions_search as sessions_search