diff --git a/.cypress/integration/10_datasources.spec.js b/.cypress/integration/10_datasources.spec.js
index c4ef7618f8..8468c58bdb 100644
--- a/.cypress/integration/10_datasources.spec.js
+++ b/.cypress/integration/10_datasources.spec.js
@@ -6,13 +6,13 @@
 /// <reference types="cypress" />
   
   const moveToDatasourcesHome = () => {
-    cy.visit(`${Cypress.env('opensearchDashboards')}/app/datasources`);
+    cy.visit(`${Cypress.env('opensearchDashboards')}/app/dataconnections`);
   };
   
   describe('Basic sanity test for datasources plugin', () => {
     it('Navigates to datasources plugin and expects the correct header', () => {
       moveToDatasourcesHome();
-      cy.get('[data-test-subj="datasources-header"]').should('exist');
+      cy.get('[data-test-subj="dataconnections-header"]').should('exist');
     });
 });
 
diff --git a/common/constants/shared.ts b/common/constants/shared.ts
index f694562214..f26a598204 100644
--- a/common/constants/shared.ts
+++ b/common/constants/shared.ts
@@ -14,7 +14,7 @@ export const DSL_CAT = '/cat.indices';
 export const DSL_MAPPING = '/indices.getFieldMapping';
 export const OBSERVABILITY_BASE = '/api/observability';
 export const INTEGRATIONS_BASE = '/api/integrations';
-export const DATASOURCES_BASE = '/api/datasources';
+export const DATACONNECTIONS_BASE = '/api/dataconnections';
 export const EVENT_ANALYTICS = '/event_analytics';
 export const SAVED_OBJECTS = '/saved_objects';
 export const SAVED_QUERY = '/query';
@@ -24,7 +24,7 @@ export const SAVED_VISUALIZATION = '/vis';
 export const PPL_ENDPOINT = '/_plugins/_ppl';
 export const SQL_ENDPOINT = '/_plugins/_sql';
 export const DSL_ENDPOINT = '/_plugins/_dsl';
-export const DATASOURCES_ENDPOINT = '/_plugins/_query/_datasources';
+export const DATACONNECTIONS_ENDPOINT = '/_plugins/_query/_datasources';
 
 export const observabilityID = 'observability-logs';
 export const observabilityTitle = 'Observability';
@@ -58,9 +58,9 @@ export const observabilityIntegrationsID = 'integrations';
 export const observabilityIntegrationsTitle = 'Integrations';
 export const observabilityIntegrationsPluginOrder = 9020;
 
-export const observabilityDatasourcesID = 'datasources';
-export const observabilityDatasourcesTitle = 'Datasources';
-export const observabilityDatasourcesPluginOrder = 9030;
+export const observabilityDataConnectionsID = 'dataconnections';
+export const observabilityDataConnectionsTitle = 'Data Connections';
+export const observabilityDataConnectionsPluginOrder = 9030;
 
 // Shared Constants
 export const SQL_DOCUMENTATION_URL = 'https://opensearch.org/docs/latest/search-plugins/sql/index/';
@@ -80,12 +80,12 @@ export const PPL_NEWLINE_REGEX = /[\n\r]+/g;
 
 // Observability plugin URI
 const BASE_OBSERVABILITY_URI = '/_plugins/_observability';
-const BASE_DATASOURCES_URI = '/_plugins/_query/_datasources';
+const BASE_DATACONNECTIONS_URI = '/_plugins/_query/_datasources';
 export const OPENSEARCH_PANELS_API = {
   OBJECT: `${BASE_OBSERVABILITY_URI}/object`,
 };
-export const OPENSEARCH_DATASOURCES_API = {
-  DATASOURCE: `${BASE_DATASOURCES_URI}`,
+export const OPENSEARCH_DATACONNECTIONS_API = {
+  DATACONNECTION: `${BASE_DATACONNECTIONS_URI}`,
 };
 
 // Saved Objects
diff --git a/public/components/app.tsx b/public/components/app.tsx
index cb7ba34e43..7ace523b4f 100644
--- a/public/components/app.tsx
+++ b/public/components/app.tsx
@@ -19,7 +19,7 @@ import { EventAnalytics } from './event_analytics';
 import { Home as MetricsHome } from './metrics/index';
 import { Main as NotebooksHome } from './notebooks/components/main';
 import { Home as TraceAnalyticsHome } from './trace_analytics/home';
-import { Home as DatasourcesHome } from './data_connections/home';
+import { Home as DataConnectionsHome } from './data_connections/home';
 
 interface ObservabilityAppDeps {
   CoreStartProp: CoreStart;
@@ -45,7 +45,7 @@ const pages = {
   notebooks: NotebooksHome,
   dashboards: CustomPanelsHome,
   integrations: IntegrationsHome,
-  datasources: DatasourcesHome,
+  dataconnections: DataConnectionsHome,
 };
 
 export const App = ({
diff --git a/public/components/data_connections/components/__tests__/__snapshots__/datasource.test.tsx.snap b/public/components/data_connections/components/__tests__/__snapshots__/data_connection.test.tsx.snap
similarity index 99%
rename from public/components/data_connections/components/__tests__/__snapshots__/datasource.test.tsx.snap
rename to public/components/data_connections/components/__tests__/__snapshots__/data_connection.test.tsx.snap
index 793dde1044..6b0a6e92c1 100644
--- a/public/components/data_connections/components/__tests__/__snapshots__/datasource.test.tsx.snap
+++ b/public/components/data_connections/components/__tests__/__snapshots__/data_connection.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Datasource Page test Renders datasource page with data 1`] = `
+exports[`Data Connection Page test Renders data connection page with data 1`] = `
 <div>
   <div
     class="euiPage euiPage--paddingMedium euiPage--grow"
diff --git a/public/components/data_connections/components/__tests__/__snapshots__/manage_datasource_description.test.tsx.snap b/public/components/data_connections/components/__tests__/__snapshots__/manage_data_connections_description.test.tsx.snap
similarity index 85%
rename from public/components/data_connections/components/__tests__/__snapshots__/manage_datasource_description.test.tsx.snap
rename to public/components/data_connections/components/__tests__/__snapshots__/manage_data_connections_description.test.tsx.snap
index 4dbd5ddf8c..2cc84b45b3 100644
--- a/public/components/data_connections/components/__tests__/__snapshots__/manage_datasource_description.test.tsx.snap
+++ b/public/components/data_connections/components/__tests__/__snapshots__/manage_data_connections_description.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Manage Datasource Description test Renders manage datasource description 1`] = `
+exports[`Manage Data Connections Description test Renders manage data connections description 1`] = `
 <Component>
   <div>
     <EuiTitle
@@ -33,7 +33,7 @@ exports[`Manage Datasource Description test Renders manage datasource descriptio
           <div
             className="euiTextColor euiTextColor--subdued"
           >
-            Manage already created data source connections.
+            Manage already created data connections.
           </div>
         </EuiTextColor>
       </div>
diff --git a/public/components/data_connections/components/__tests__/__snapshots__/manage_datasource_table.test.tsx.snap b/public/components/data_connections/components/__tests__/__snapshots__/manage_data_connections_table.test.tsx.snap
similarity index 97%
rename from public/components/data_connections/components/__tests__/__snapshots__/manage_datasource_table.test.tsx.snap
rename to public/components/data_connections/components/__tests__/__snapshots__/manage_data_connections_table.test.tsx.snap
index 8206d792b7..e61640befb 100644
--- a/public/components/data_connections/components/__tests__/__snapshots__/manage_datasource_table.test.tsx.snap
+++ b/public/components/data_connections/components/__tests__/__snapshots__/manage_data_connections_table.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Manage Datasource Table test Renders manage datasource table with data 1`] = `
+exports[`Manage Data Connections Table test Renders manage data connections table with data 1`] = `
 <div>
   <div
     class="euiPage euiPage--paddingMedium euiPage--grow"
@@ -17,7 +17,7 @@ exports[`Manage Datasource Table test Renders manage datasource table with data
           >
             <h1
               class="euiTitle euiTitle--large"
-              data-test-subj="datasources-header"
+              data-test-subj="dataconnections-header"
             >
               Data connections
             </h1>
@@ -32,7 +32,7 @@ exports[`Manage Datasource Table test Renders manage datasource table with data
           <div
             class="euiTextColor euiTextColor--subdued"
           >
-            Connect and manage compatible OpenSearch Dashboard data sources and compute.
+            Connect and manage compatible OpenSearch and OpenSearch Dashboard data connections.
              
             <a
               class="euiLink euiLink--primary"
@@ -79,7 +79,7 @@ exports[`Manage Datasource Table test Renders manage datasource table with data
             <div
               class="euiTextColor euiTextColor--subdued"
             >
-              Manage already created data source connections.
+              Manage already created data connections.
             </div>
           </div>
           <hr
@@ -308,7 +308,7 @@ exports[`Manage Datasource Table test Renders manage datasource table with data
                       >
                         <div
                           class="euiText euiText--medium"
-                          data-test-subj="undefinedDatasourceConnectionHealth"
+                          data-test-subj="undefinedDataConnectionHealth"
                         />
                       </div>
                     </td>
@@ -384,7 +384,7 @@ exports[`Manage Datasource Table test Renders manage datasource table with data
                       >
                         <div
                           class="euiText euiText--medium"
-                          data-test-subj="undefinedDatasourceConnectionHealth"
+                          data-test-subj="undefinedDataConnectionHealth"
                         />
                       </div>
                     </td>
@@ -460,7 +460,7 @@ exports[`Manage Datasource Table test Renders manage datasource table with data
                       >
                         <div
                           class="euiText euiText--medium"
-                          data-test-subj="undefinedDatasourceConnectionHealth"
+                          data-test-subj="undefinedDataConnectionHealth"
                         />
                       </div>
                     </td>
@@ -536,7 +536,7 @@ exports[`Manage Datasource Table test Renders manage datasource table with data
                       >
                         <div
                           class="euiText euiText--medium"
-                          data-test-subj="undefinedDatasourceConnectionHealth"
+                          data-test-subj="undefinedDataConnectionHealth"
                         />
                       </div>
                     </td>
diff --git a/public/components/data_connections/components/__tests__/datasource.test.tsx b/public/components/data_connections/components/__tests__/data_connection.test.tsx
similarity index 52%
rename from public/components/data_connections/components/__tests__/datasource.test.tsx
rename to public/components/data_connections/components/__tests__/data_connection.test.tsx
index 8294e05989..9e16fcda80 100644
--- a/public/components/data_connections/components/__tests__/datasource.test.tsx
+++ b/public/components/data_connections/components/__tests__/data_connection.test.tsx
@@ -7,18 +7,16 @@ import { configure, mount } from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
 import { act, waitFor } from '@testing-library/react';
 import React from 'react';
-import { DataConnectionsDescription } from '../manage_datasource_description';
-import { ManageDatasourcesTable } from '../manage_datasource_table';
-import { describeDatasource, showDatasourceData } from './testing_constants';
-import { DataSource } from '../datasource';
+import { describeDataConnection } from './testing_constants';
+import { DataConnection } from '../data_connection';
 import ReactDOM from 'react-dom';
 
-describe('Datasource Page test', () => {
+describe('Data Connection Page test', () => {
   configure({ adapter: new Adapter() });
 
-  it('Renders datasource page with data', async () => {
+  it('Renders data connection page with data', async () => {
     const http = {
-      get: jest.fn().mockResolvedValue(describeDatasource),
+      get: jest.fn().mockResolvedValue(describeDataConnection),
     };
     const pplService = {
       fetch: jest.fn(),
@@ -26,11 +24,13 @@ describe('Datasource Page test', () => {
     const mockChrome = {
       setBreadcrumbs: jest.fn(),
     };
-    const wrapper = mount(<DataSource http={http} pplService={pplService} chrome={mockChrome} />);
+    const wrapper = mount(
+      <DataConnection http={http} pplService={pplService} chrome={mockChrome} />
+    );
     const container = document.createElement('div');
     await act(() => {
       ReactDOM.render(
-        <DataSource http={http} pplService={pplService} chrome={mockChrome} />,
+        <DataConnection http={http} pplService={pplService} chrome={mockChrome} />,
         container
       );
     });
diff --git a/public/components/data_connections/components/__tests__/manage_datasource_description.test.tsx b/public/components/data_connections/components/__tests__/manage_data_connections_description.test.tsx
similarity index 67%
rename from public/components/data_connections/components/__tests__/manage_datasource_description.test.tsx
rename to public/components/data_connections/components/__tests__/manage_data_connections_description.test.tsx
index e6380b0d51..6862306831 100644
--- a/public/components/data_connections/components/__tests__/manage_datasource_description.test.tsx
+++ b/public/components/data_connections/components/__tests__/manage_data_connections_description.test.tsx
@@ -7,12 +7,12 @@ import { configure, mount } from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
 import { waitFor } from '@testing-library/react';
 import React from 'react';
-import { DataConnectionsDescription } from '../manage_datasource_description';
+import { DataConnectionsDescription } from '../manage_data_connections_description';
 
-describe('Manage Datasource Description test', () => {
+describe('Manage Data Connections Description test', () => {
   configure({ adapter: new Adapter() });
 
-  it('Renders manage datasource description', async () => {
+  it('Renders manage data connections description', async () => {
     const wrapper = mount(<DataConnectionsDescription />);
 
     await waitFor(() => {
diff --git a/public/components/data_connections/components/__tests__/manage_datasource_table.test.tsx b/public/components/data_connections/components/__tests__/manage_data_connections_table.test.tsx
similarity index 60%
rename from public/components/data_connections/components/__tests__/manage_datasource_table.test.tsx
rename to public/components/data_connections/components/__tests__/manage_data_connections_table.test.tsx
index 599a7a235e..380fcf3924 100644
--- a/public/components/data_connections/components/__tests__/manage_datasource_table.test.tsx
+++ b/public/components/data_connections/components/__tests__/manage_data_connections_table.test.tsx
@@ -7,16 +7,16 @@ import { configure } from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
 import { act } from '@testing-library/react';
 import React from 'react';
-import { ManageDatasourcesTable } from '../manage_datasource_table';
-import { showDatasourceData } from './testing_constants';
+import { ManageDataConnectionsTable } from '../manage_data_connections_table';
+import { showDataConnectionsData } from './testing_constants';
 import ReactDOM from 'react-dom';
 
-describe('Manage Datasource Table test', () => {
+describe('Manage Data Connections Table test', () => {
   configure({ adapter: new Adapter() });
 
-  it('Renders manage datasource table with data', async () => {
+  it('Renders manage data connections table with data', async () => {
     const http = {
-      get: jest.fn().mockResolvedValue(showDatasourceData),
+      get: jest.fn().mockResolvedValue(showDataConnectionsData),
     };
     const pplService = {
       fetch: jest.fn(),
@@ -27,7 +27,7 @@ describe('Manage Datasource Table test', () => {
     const container = document.createElement('div');
     await act(() => {
       ReactDOM.render(
-        <ManageDatasourcesTable http={http} pplService={pplService} chrome={mockChrome} />,
+        <ManageDataConnectionsTable http={http} pplService={pplService} chrome={mockChrome} />,
         container
       );
     });
diff --git a/public/components/data_connections/components/__tests__/testing_constants.ts b/public/components/data_connections/components/__tests__/testing_constants.ts
index 5cad339575..995e149fe8 100644
--- a/public/components/data_connections/components/__tests__/testing_constants.ts
+++ b/public/components/data_connections/components/__tests__/testing_constants.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export const showDatasourceData = [
+export const showDataConnectionsData = [
   {
     name: 'my_spark3',
     connector: 'SPARK',
@@ -59,7 +59,7 @@ export const showDatasourceData = [
   },
 ];
 
-export const describeDatasource = {
+export const describeDataConnection = {
   name: 'my_spark3',
   connector: 'SPARK',
   allowedRoles: [],
diff --git a/public/components/data_connections/components/acceleration_ui/acceleration_indices.tsx b/public/components/data_connections/components/acceleration_ui/acceleration_indices.tsx
index 2d98c2d28f..03520416dd 100644
--- a/public/components/data_connections/components/acceleration_ui/acceleration_indices.tsx
+++ b/public/components/data_connections/components/acceleration_ui/acceleration_indices.tsx
@@ -10,22 +10,22 @@ import { AccelerationHeader } from './acceleration_header';
 import { AccelerationManagement } from './management/acceleration_management';
 
 interface AccelerationIndicesProps {
-  dataSource: string;
+  dataConnection: string;
 }
 
-export const AccelerationIndices = ({ dataSource }: AccelerationIndicesProps) => {
+export const AccelerationIndices = ({ dataConnection }: AccelerationIndicesProps) => {
   useEffect(() => {
     coreRefs.chrome?.setBreadcrumbs([
       {
-        text: 'Datasources',
+        text: 'Data Connections',
         href: '#/',
       },
       {
         text: 'Acceleration',
-        href: '#/manage/acceleration/' + { dataSource },
+        href: '#/manage/acceleration/' + { dataConnection },
       },
     ]);
-  }, [dataSource]);
+  }, [dataConnection]);
   return (
     <EuiPage>
       <EuiPageBody component="div">
diff --git a/public/components/data_connections/components/datasource.tsx b/public/components/data_connections/components/data_connection.tsx
similarity index 96%
rename from public/components/data_connections/components/datasource.tsx
rename to public/components/data_connections/components/data_connection.tsx
index 0964a16a81..e36aeacf93 100644
--- a/public/components/data_connections/components/datasource.tsx
+++ b/public/components/data_connections/components/data_connection.tsx
@@ -21,7 +21,7 @@ import {
   EuiTabs,
 } from '@elastic/eui';
 import React, { useEffect, useState } from 'react';
-import { DATASOURCES_BASE } from '../../../../common/constants/shared';
+import { DATACONNECTIONS_BASE } from '../../../../common/constants/shared';
 
 interface DatasourceDetails {
   allowedRoles: string[];
@@ -29,7 +29,7 @@ interface DatasourceDetails {
   cluster: string;
 }
 
-export const DataSource = (props: any) => {
+export const DataConnection = (props: any) => {
   const { dataSource, pplService, http } = props;
   const [datasourceDetails, setDatasourceDetails] = useState<DatasourceDetails>({
     allowedRoles: [],
@@ -38,7 +38,7 @@ export const DataSource = (props: any) => {
   });
 
   useEffect(() => {
-    http.get(`${DATASOURCES_BASE}/${dataSource}`).then((data) =>
+    http.get(`${DATACONNECTIONS_BASE}/${dataSource}`).then((data) =>
       setDatasourceDetails({
         allowedRoles: data.allowedRoles,
         name: data.name,
diff --git a/public/components/data_connections/components/datasources_header.tsx b/public/components/data_connections/components/data_connections_header.tsx
similarity index 83%
rename from public/components/data_connections/components/datasources_header.tsx
rename to public/components/data_connections/components/data_connections_header.tsx
index 045d1cbc86..7f071683b4 100644
--- a/public/components/data_connections/components/datasources_header.tsx
+++ b/public/components/data_connections/components/data_connections_header.tsx
@@ -20,14 +20,14 @@ export const DataConnectionsHeader = () => {
     <div>
       <EuiPageHeader>
         <EuiPageHeaderSection>
-          <EuiTitle size="l" data-test-subj="datasources-header">
+          <EuiTitle size="l" data-test-subj="dataconnections-header">
             <h1>Data connections</h1>
           </EuiTitle>
         </EuiPageHeaderSection>
       </EuiPageHeader>
       <EuiSpacer size="s" />
       <EuiText size="s" color="subdued">
-        Connect and manage compatible OpenSearch Dashboard data sources and compute.{' '}
+        Connect and manage compatible OpenSearch and OpenSearch Dashboard data connections.{' '}
         <EuiLink external={true} href={OPENSEARCH_DOCUMENTATION_URL} target="blank">
           Learn more
         </EuiLink>
diff --git a/public/components/data_connections/components/manage_datasource_description.tsx b/public/components/data_connections/components/manage_data_connections_description.tsx
similarity index 86%
rename from public/components/data_connections/components/manage_datasource_description.tsx
rename to public/components/data_connections/components/manage_data_connections_description.tsx
index 9c97d57588..26cfa90cc8 100644
--- a/public/components/data_connections/components/manage_datasource_description.tsx
+++ b/public/components/data_connections/components/manage_data_connections_description.tsx
@@ -4,7 +4,6 @@
  */
 
 import { EuiSpacer, EuiText, EuiTitle, EuiHorizontalRule } from '@elastic/eui';
-import _ from 'lodash';
 import React from 'react';
 
 export const DataConnectionsDescription = () => {
@@ -16,7 +15,7 @@ export const DataConnectionsDescription = () => {
 
       <EuiSpacer size="s" />
       <EuiText size="s" color="subdued">
-        Manage already created data source connections.
+        Manage already created data connections.
       </EuiText>
       <EuiHorizontalRule size="full" />
     </div>
diff --git a/public/components/data_connections/components/manage_datasource_table.tsx b/public/components/data_connections/components/manage_data_connections_table.tsx
similarity index 87%
rename from public/components/data_connections/components/manage_datasource_table.tsx
rename to public/components/data_connections/components/manage_data_connections_table.tsx
index c5650d308b..02751bcb53 100644
--- a/public/components/data_connections/components/manage_datasource_table.tsx
+++ b/public/components/data_connections/components/manage_data_connections_table.tsx
@@ -17,10 +17,10 @@ import {
 } from '@elastic/eui';
 import _ from 'lodash';
 import React, { useEffect, useState } from 'react';
-import { DataConnectionsHeader } from './datasources_header';
+import { DataConnectionsHeader } from './data_connections_header';
 import { HomeProps } from '../home';
-import { DataConnectionsDescription } from './manage_datasource_description';
-import { DATASOURCES_BASE } from '../../../../common/constants/shared';
+import { DataConnectionsDescription } from './manage_data_connections_description';
+import { DATACONNECTIONS_BASE } from '../../../../common/constants/shared';
 import { ChromeStart } from '../../../../../../src/core/public';
 
 interface DataConnection {
@@ -29,7 +29,7 @@ interface DataConnection {
   chrome: ChromeStart;
 }
 
-export const ManageDatasourcesTable = (props: HomeProps) => {
+export const ManageDataConnectionsTable = (props: HomeProps) => {
   const { http, chrome, pplService } = props;
 
   const [data, setData] = useState([]);
@@ -37,7 +37,7 @@ export const ManageDatasourcesTable = (props: HomeProps) => {
   useEffect(() => {
     chrome.setBreadcrumbs([
       {
-        text: 'Datasources',
+        text: 'Data Connections',
         href: '#/',
       },
     ]);
@@ -45,9 +45,9 @@ export const ManageDatasourcesTable = (props: HomeProps) => {
   }, [chrome]);
 
   async function handleDataRequest() {
-    http.get(`${DATASOURCES_BASE}`).then((datasources) =>
+    http.get(`${DATACONNECTIONS_BASE}`).then((dataconnections) =>
       setData(
-        datasources.map((x: any) => {
+        dataconnections.map((x: any) => {
           return { name: x.name, connectionType: x.connector };
         })
       )
@@ -89,7 +89,7 @@ export const ManageDatasourcesTable = (props: HomeProps) => {
       sortable: true,
       truncateText: true,
       render: (value, record) => (
-        <EuiText data-test-subj={`${record.templateName}DatasourceConnectionHealth`}>
+        <EuiText data-test-subj={`${record.templateName}DataConnectionHealth`}>
           {_.truncate(record.creationDate, { length: 100 })}
         </EuiText>
       ),
diff --git a/public/components/data_connections/home.tsx b/public/components/data_connections/home.tsx
index c59a0afd8a..534a71815a 100644
--- a/public/components/data_connections/home.tsx
+++ b/public/components/data_connections/home.tsx
@@ -6,8 +6,8 @@
 import React from 'react';
 import { HashRouter, Route, RouteComponentProps, Switch } from 'react-router-dom';
 import { ChromeBreadcrumb, ChromeStart, HttpStart } from '../../../../../src/core/public';
-import { DataSource } from './components/datasource';
-import { ManageDatasourcesTable } from './components/manage_datasource_table';
+import { DataConnection } from './components/data_connection';
+import { ManageDataConnectionsTable } from './components/manage_data_connections_table';
 import { AccelerationIndices } from './components/acceleration_ui/acceleration_indices';
 
 export interface HomeProps extends RouteComponentProps {
@@ -33,7 +33,7 @@ export const Home = (props: HomeProps) => {
           exact
           path={'/manage/:id+'}
           render={(routerProps) => (
-            <DataSource
+            <DataConnection
               {...commonProps}
               dataSource={decodeURIComponent(routerProps.match.params.id)}
             />
@@ -43,13 +43,13 @@ export const Home = (props: HomeProps) => {
         <Route
           exact
           path={['/', '/manage']}
-          render={(routerProps) => <ManageDatasourcesTable {...commonProps} />}
+          render={(routerProps) => <ManageDataConnectionsTable {...commonProps} />}
         />
 
         <Route
           path={'/acceleration/:id+'}
           render={(routerProps) => (
-            <AccelerationIndices dataSource={decodeURIComponent(routerProps.match.params.id)} />
+            <AccelerationIndices dataConnection={decodeURIComponent(routerProps.match.params.id)} />
           )}
         />
       </Switch>
diff --git a/public/plugin.ts b/public/plugin.ts
index 81da89b802..e3215ce02c 100644
--- a/public/plugin.ts
+++ b/public/plugin.ts
@@ -39,9 +39,9 @@ import {
   observabilityIntegrationsTitle,
   observabilityIntegrationsPluginOrder,
   observabilityPluginOrder,
-  observabilityDatasourcesID,
-  observabilityDatasourcesTitle,
-  observabilityDatasourcesPluginOrder,
+  observabilityDataConnectionsID,
+  observabilityDataConnectionsPluginOrder,
+  observabilityDataConnectionsTitle,
 } from '../common/constants/shared';
 import { QueryManager } from '../common/query_manager';
 import { VISUALIZATION_SAVED_OBJECT } from '../common/types/observability_saved_object_attributes';
@@ -201,19 +201,19 @@ export class ObservabilityPlugin
     });
 
     core.application.register({
-      id: observabilityDatasourcesID,
-      title: observabilityDatasourcesTitle,
+      id: observabilityDataConnectionsID,
+      title: observabilityDataConnectionsTitle,
       category: DEFAULT_APP_CATEGORIES.management,
-      order: observabilityDatasourcesPluginOrder,
-      mount: appMountWithStartPage('datasources'),
+      order: observabilityDataConnectionsPluginOrder,
+      mount: appMountWithStartPage('dataconnections'),
     });
 
     setupDeps.managementOverview?.register({
-      id: observabilityDatasourcesID,
-      title: observabilityDatasourcesTitle,
+      id: observabilityDataConnectionsID,
+      title: observabilityDataConnectionsTitle,
       order: 9070,
-      description: i18n.translate('observability.datasourcesDescription', {
-        defaultMessage: 'Manage compatible data sources and compute with OpenSearch Dashboards.',
+      description: i18n.translate('observability.dataconnectionsDescription', {
+        defaultMessage: 'Manage compatible data connections with OpenSearch Dashboards.',
       }),
     });
 
diff --git a/server/adaptors/ppl_plugin.ts b/server/adaptors/ppl_plugin.ts
index e4714c9d00..71dbcb5696 100644
--- a/server/adaptors/ppl_plugin.ts
+++ b/server/adaptors/ppl_plugin.ts
@@ -4,7 +4,7 @@
  */
 
 import {
-  OPENSEARCH_DATASOURCES_API,
+  OPENSEARCH_DATACONNECTIONS_API,
   PPL_ENDPOINT,
   SQL_ENDPOINT,
 } from '../../common/constants/shared';
@@ -42,11 +42,11 @@ export const PPLPlugin = function (Client, config, components) {
     method: 'POST',
   });
 
-  ppl.getDatasourceById = ca({
+  ppl.getDataConnectionById = ca({
     url: {
-      fmt: `${OPENSEARCH_DATASOURCES_API.DATASOURCE}/<%=datasource%>`,
+      fmt: `${OPENSEARCH_DATACONNECTIONS_API.DATACONNECTION}/<%=dataconnection%>`,
       req: {
-        datasource: {
+        dataconnection: {
           type: 'string',
           required: true,
         },
@@ -55,9 +55,9 @@ export const PPLPlugin = function (Client, config, components) {
     method: 'GET',
   });
 
-  ppl.getDatasources = ca({
+  ppl.getDataConnections = ca({
     url: {
-      fmt: `${OPENSEARCH_DATASOURCES_API.DATASOURCE}`,
+      fmt: `${OPENSEARCH_DATACONNECTIONS_API.DATACONNECTION}`,
     },
     method: 'GET',
   });
diff --git a/server/routes/datasources/datasources_router.ts b/server/routes/data_connections/data_connections_router.ts
similarity index 55%
rename from server/routes/datasources/datasources_router.ts
rename to server/routes/data_connections/data_connections_router.ts
index 187be8da1c..ff276db80e 100644
--- a/server/routes/datasources/datasources_router.ts
+++ b/server/routes/data_connections/data_connections_router.ts
@@ -5,12 +5,12 @@
 
 import { schema } from '@osd/config-schema';
 import { IRouter } from '../../../../../src/core/server';
-import { DATASOURCES_BASE } from '../../../common/constants/shared';
+import { DATACONNECTIONS_BASE } from '../../../common/constants/shared';
 
-export function registerDatasourcesRoute(router: IRouter) {
+export function registerDataConnectionsRoute(router: IRouter) {
   router.get(
     {
-      path: `${DATASOURCES_BASE}/{name}`,
+      path: `${DATACONNECTIONS_BASE}/{name}`,
       validate: {
         params: schema.object({
           name: schema.string(),
@@ -19,16 +19,16 @@ export function registerDatasourcesRoute(router: IRouter) {
     },
     async (context, request, response): Promise<any> => {
       try {
-        const dataSourcesresponse = await context.observability_plugin.observabilityClient
+        const dataConnectionsresponse = await context.observability_plugin.observabilityClient
           .asScoped(request)
-          .callAsCurrentUser('ppl.getDatasourceById', {
-            datasource: request.params.name,
+          .callAsCurrentUser('ppl.getDataConnectionById', {
+            dataconnection: request.params.name,
           });
         return response.ok({
-          body: dataSourcesresponse,
+          body: dataConnectionsresponse,
         });
       } catch (error: any) {
-        console.error('Issue in fetching datasource:', error);
+        console.error('Issue in fetching data connection:', error);
         return response.custom({
           statusCode: error.statusCode || 500,
           body: error.message,
@@ -39,19 +39,19 @@ export function registerDatasourcesRoute(router: IRouter) {
 
   router.get(
     {
-      path: `${DATASOURCES_BASE}`,
+      path: `${DATACONNECTIONS_BASE}`,
       validate: false,
     },
     async (context, request, response): Promise<any> => {
       try {
-        const dataSourcesresponse = await context.observability_plugin.observabilityClient
+        const dataConnectionsresponse = await context.observability_plugin.observabilityClient
           .asScoped(request)
-          .callAsCurrentUser('ppl.getDatasources');
+          .callAsCurrentUser('ppl.getDataConnections');
         return response.ok({
-          body: dataSourcesresponse,
+          body: dataConnectionsresponse,
         });
       } catch (error: any) {
-        console.error('Issue in fetching datasources:', error);
+        console.error('Issue in fetching data connections:', error);
         return response.custom({
           statusCode: error.statusCode || 500,
           body: error.message,
diff --git a/server/routes/index.ts b/server/routes/index.ts
index 6601127a58..4c278fa459 100644
--- a/server/routes/index.ts
+++ b/server/routes/index.ts
@@ -21,7 +21,7 @@ import { registerEventAnalyticsRouter } from './event_analytics/event_analytics_
 import { registerAppAnalyticsRouter } from './application_analytics/app_analytics_router';
 import { registerMetricsRoute } from './metrics/metrics_rounter';
 import { registerIntegrationsRoute } from './integrations/integrations_router';
-import { registerDatasourcesRoute } from './datasources/datasources_router';
+import { registerDataConnectionsRoute } from './data_connections/data_connections_router';
 
 export function setupRoutes({ router, client }: { router: IRouter; client: ILegacyClusterClient }) {
   PanelsRouter(router);
@@ -43,5 +43,5 @@ export function setupRoutes({ router, client }: { router: IRouter; client: ILega
 
   registerMetricsRoute(router);
   registerIntegrationsRoute(router);
-  registerDatasourcesRoute(router);
+  registerDataConnectionsRoute(router);
 }