diff --git a/x-pack/plugins/data/kibana.json b/x-pack/plugins/data/kibana.json
index 21f44a3ae9259..4dbfe958eff68 100644
--- a/x-pack/plugins/data/kibana.json
+++ b/x-pack/plugins/data/kibana.json
@@ -1,5 +1,5 @@
 {
-  "id": "data_xpack",
+  "id": "data_enhanced",
   "version": "8.0.0",
   "kibanaVersion": "kibana",
   "configPath": [
diff --git a/x-pack/plugins/data/public/index.ts b/x-pack/plugins/data/public/index.ts
index 0e614264385ef..e40292345fc73 100644
--- a/x-pack/plugins/data/public/index.ts
+++ b/x-pack/plugins/data/public/index.ts
@@ -5,16 +5,16 @@
  */
 import { PluginInitializer } from 'kibana/public';
 import {
-  DataPublicPlugin as Plugin,
-  DataPublicSetup,
-  DataPublicStart,
-  DataPublicSetupDependencies,
-  DataPublicStartDependencies,
+  DataEnhancedPublicPlugin as Plugin,
+  DataEnhancedPublicSetup,
+  DataEnhancedPublicStart,
+  DataEnhancedPublicSetupDependencies,
+  DataEnhancedPublicStartDependencies,
 } from './plugin';
 
 export const plugin: PluginInitializer<
-  DataPublicSetup,
-  DataPublicStart,
-  DataPublicSetupDependencies,
-  DataPublicStartDependencies
+  DataEnhancedPublicSetup,
+  DataEnhancedPublicStart,
+  DataEnhancedPublicSetupDependencies,
+  DataEnhancedPublicStartDependencies
 > = () => new Plugin();
diff --git a/x-pack/plugins/data/public/plugin.ts b/x-pack/plugins/data/public/plugin.ts
index 4d74754e4a62a..4456235a72497 100644
--- a/x-pack/plugins/data/public/plugin.ts
+++ b/x-pack/plugins/data/public/plugin.ts
@@ -5,29 +5,29 @@
  */
 
 import { CoreSetup, CoreStart, Plugin } from 'src/core/public';
-import { DataPublicPluginStart, DataPublicPluginSetup } from '../../../../src/plugins/data/public';
+import { DataPublicPluginSetup, DataPublicPluginStart } from '../../../../src/plugins/data/public';
 import { setAutocompleteService } from './services';
 import { setupKqlQuerySuggestionProvider, KUERY_LANGUAGE_NAME } from './autocomplete';
 
-export interface DataPublicSetupDependencies {
+export interface DataEnhancedPublicSetupDependencies {
   data: DataPublicPluginSetup;
 }
-export interface DataPublicStartDependencies {
+export interface DataEnhancedPublicStartDependencies {
   data: DataPublicPluginStart;
 }
 
-export type DataPublicSetup = ReturnType<DataPublicPlugin['setup']>;
-export type DataPublicStart = ReturnType<DataPublicPlugin['start']>;
+export type DataEnhancedPublicSetup = ReturnType<DataEnhancedPublicPlugin['setup']>;
+export type DataEnhancedPublicStart = ReturnType<DataEnhancedPublicPlugin['start']>;
 
-export class DataPublicPlugin implements Plugin {
-  public setup(core: CoreSetup, plugins: DataPublicSetupDependencies) {
+export class DataEnhancedPublicPlugin implements Plugin {
+  public setup(core: CoreSetup, plugins: DataEnhancedPublicSetupDependencies) {
     plugins.data.autocomplete.addQuerySuggestionProvider(
       KUERY_LANGUAGE_NAME,
       setupKqlQuerySuggestionProvider(core)
     );
   }
 
-  public start(core: CoreStart, plugins: DataPublicStartDependencies) {
+  public start(core: CoreStart, plugins: DataEnhancedPublicStartDependencies) {
     setAutocompleteService(plugins.data.autocomplete);
   }
 }