diff --git a/src/backend/base/langflow/components/astra_assistants/__init__.py b/src/backend/base/langflow/components/datastax/__init__.py
similarity index 79%
rename from src/backend/base/langflow/components/astra_assistants/__init__.py
rename to src/backend/base/langflow/components/datastax/__init__.py
index b24554af8..da551f650 100644
--- a/src/backend/base/langflow/components/astra_assistants/__init__.py
+++ b/src/backend/base/langflow/components/datastax/__init__.py
@@ -1,4 +1,6 @@
 from .astra_assistant_manager import AstraAssistantManager
+from .astradb_cql import AstraDBCQLToolComponent
+from .astradb_tool import AstraDBToolComponent
 from .create_assistant import AssistantsCreateAssistant
 from .create_thread import AssistantsCreateThread
 from .dotenv import Dotenv
@@ -14,6 +16,8 @@ __all__ = [
     "AssistantsListAssistants",
     "AssistantsRun",
     "AstraAssistantManager",
+    "AstraDBCQLToolComponent",
+    "AstraDBToolComponent",
     "Dotenv",
     "GetEnvVar",
 ]
diff --git a/src/backend/base/langflow/components/astra_assistants/astra_assistant_manager.py b/src/backend/base/langflow/components/datastax/astra_assistant_manager.py
similarity index 100%
rename from src/backend/base/langflow/components/astra_assistants/astra_assistant_manager.py
rename to src/backend/base/langflow/components/datastax/astra_assistant_manager.py
diff --git a/src/backend/base/langflow/components/tools/astradb_cql.py b/src/backend/base/langflow/components/datastax/astradb_cql.py
similarity index 100%
rename from src/backend/base/langflow/components/tools/astradb_cql.py
rename to src/backend/base/langflow/components/datastax/astradb_cql.py
diff --git a/src/backend/base/langflow/components/tools/astradb.py b/src/backend/base/langflow/components/datastax/astradb_tool.py
similarity index 100%
rename from src/backend/base/langflow/components/tools/astradb.py
rename to src/backend/base/langflow/components/datastax/astradb_tool.py
diff --git a/src/backend/base/langflow/components/astra_assistants/create_assistant.py b/src/backend/base/langflow/components/datastax/create_assistant.py
similarity index 100%
rename from src/backend/base/langflow/components/astra_assistants/create_assistant.py
rename to src/backend/base/langflow/components/datastax/create_assistant.py
diff --git a/src/backend/base/langflow/components/astra_assistants/create_thread.py b/src/backend/base/langflow/components/datastax/create_thread.py
similarity index 100%
rename from src/backend/base/langflow/components/astra_assistants/create_thread.py
rename to src/backend/base/langflow/components/datastax/create_thread.py
diff --git a/src/backend/base/langflow/components/astra_assistants/dotenv.py b/src/backend/base/langflow/components/datastax/dotenv.py
similarity index 100%
rename from src/backend/base/langflow/components/astra_assistants/dotenv.py
rename to src/backend/base/langflow/components/datastax/dotenv.py
diff --git a/src/backend/base/langflow/components/astra_assistants/get_assistant.py b/src/backend/base/langflow/components/datastax/get_assistant.py
similarity index 100%
rename from src/backend/base/langflow/components/astra_assistants/get_assistant.py
rename to src/backend/base/langflow/components/datastax/get_assistant.py
diff --git a/src/backend/base/langflow/components/astra_assistants/getenvvar.py b/src/backend/base/langflow/components/datastax/getenvvar.py
similarity index 100%
rename from src/backend/base/langflow/components/astra_assistants/getenvvar.py
rename to src/backend/base/langflow/components/datastax/getenvvar.py
diff --git a/src/backend/base/langflow/components/astra_assistants/list_assistants.py b/src/backend/base/langflow/components/datastax/list_assistants.py
similarity index 100%
rename from src/backend/base/langflow/components/astra_assistants/list_assistants.py
rename to src/backend/base/langflow/components/datastax/list_assistants.py
diff --git a/src/backend/base/langflow/components/astra_assistants/run.py b/src/backend/base/langflow/components/datastax/run.py
similarity index 100%
rename from src/backend/base/langflow/components/astra_assistants/run.py
rename to src/backend/base/langflow/components/datastax/run.py
diff --git a/src/backend/base/langflow/components/tools/__init__.py b/src/backend/base/langflow/components/tools/__init__.py
index 4294a3dc3..0a3f53186 100644
--- a/src/backend/base/langflow/components/tools/__init__.py
+++ b/src/backend/base/langflow/components/tools/__init__.py
@@ -35,13 +35,9 @@ from .yahoo_finance import YfinanceToolComponent
 
 with warnings.catch_warnings():
     warnings.simplefilter("ignore", LangChainDeprecationWarning)
-    from .astradb import AstraDBToolComponent
-    from .astradb_cql import AstraDBCQLToolComponent
 
 __all__ = [
     "ArXivComponent",
-    "AstraDBCQLToolComponent",
-    "AstraDBToolComponent",
     "BingSearchAPIComponent",
     "CalculatorComponent",
     "CalculatorToolComponent",
diff --git a/src/backend/tests/integration/components/assistants/test_assistants_components.py b/src/backend/tests/integration/components/assistants/test_assistants_components.py
index 48ea33503..59c0c968e 100644
--- a/src/backend/tests/integration/components/assistants/test_assistants_components.py
+++ b/src/backend/tests/integration/components/assistants/test_assistants_components.py
@@ -1,5 +1,5 @@
 import pytest
-from langflow.components.astra_assistants import (
+from langflow.components.datastax import (
     AssistantsCreateAssistant,
     AssistantsCreateThread,
     AssistantsGetAssistantName,
diff --git a/src/frontend/src/utils/styleUtils.ts b/src/frontend/src/utils/styleUtils.ts
index 01f12463d..03b9ba501 100644
--- a/src/frontend/src/utils/styleUtils.ts
+++ b/src/frontend/src/utils/styleUtils.ts
@@ -243,7 +243,7 @@ export const SIDEBAR_BUNDLES = [
   { display_name: "AssemblyAI", name: "assemblyai", icon: "AssemblyAI" },
   {
     display_name: "DataStax",
-    name: "astra_assistants",
+    name: "datastax",
     icon: "AstraDB",
   },
   { display_name: "Olivya", name: "olivya", icon: "Olivya" },