Improve features plugin's contract type names (#187944)

## Summary

Fix https://github.com/elastic/kibana/issues/65999

Change the `features` plugin's contract type names to follow our naming
convensions and to avoid needing to rename them during imports

(and yeah, I'm triggering a review from 30 teams again for a type
rename, just for the fun of it)

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>

examples/feature_control_examples/server/plugin.ts

@@ -8,7 +8,7 @@
 
 import { CoreSetup, DEFAULT_APP_CATEGORIES, Plugin } from '@kbn/core/server';
 import {
-  PluginSetupContract as FeaturesPluginSetup,
+  FeaturesPluginSetup,
   // PluginStartContract as FeaturesPluginStart,
 } from '@kbn/features-plugin/server';
 import { FEATURE_PRIVILEGES_PLUGIN_ID } from '../common';

examples/user_profile_examples/server/plugin.ts

@@ -7,10 +7,7 @@
  */
 
 import type { Plugin, CoreSetup } from '@kbn/core/server';
-import {
-  PluginSetupContract as FeaturesPluginSetup,
-  PluginStartContract as FeaturesPluginStart,
-} from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup, FeaturesPluginStart } from '@kbn/features-plugin/server';
 import { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/server';
 import { SpacesPluginSetup, SpacesPluginStart } from '@kbn/spaces-plugin/server';
 import { schema } from '@kbn/config-schema';

src/plugins/ai_assistant_management/selection/server/types.ts

@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import type { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface AIAssistantManagementSelectionPluginServerDependenciesStart {}

src/plugins/guided_onboarding/server/plugin.ts

@@ -9,7 +9,7 @@
 import { PluginInitializerContext, CoreSetup, Plugin, Logger } from '@kbn/core/server';
 
 import type { GuideId, GuideConfig } from '@kbn/guided-onboarding';
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { GUIDED_ONBOARDING_FEATURE } from './feature';
 import { GuidedOnboardingPluginSetup, GuidedOnboardingPluginStart } from './types';
 import { defineRoutes } from './routes';

x-pack/examples/alerting_example/server/plugin.ts

@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 // import directly to support examples functional tests (@kbn-test/src/functional_tests/lib/babel_register_for_test_plugins.js)
 import { DEFAULT_APP_CATEGORIES } from '@kbn/core-application-common';
 import { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 
 import { ruleType as alwaysFiringRule } from './rule_types/always_firing';
 import { ruleType as peopleInSpaceRule } from './rule_types/astros';

x-pack/plugins/actions/server/plugin.ts

@@ -32,7 +32,7 @@ import {
 } from '@kbn/task-manager-plugin/server';
 import { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/server';
 import { SpacesPluginStart, SpacesPluginSetup } from '@kbn/spaces-plugin/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/server';
 import {
   IEventLogClientService,

x-pack/plugins/alerting/server/alerting_authorization_client_factory.ts

@@ -7,7 +7,7 @@
 
 import { KibanaRequest } from '@kbn/core/server';
 import { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/server';
-import { PluginStartContract as FeaturesPluginStart } from '@kbn/features-plugin/server';
+import { FeaturesPluginStart } from '@kbn/features-plugin/server';
 import { Space } from '@kbn/spaces-plugin/server';
 import { AlertingAuthorization } from './authorization/alerting_authorization';
 import { RuleTypeRegistry } from './types';

x-pack/plugins/alerting/server/authorization/alerting_authorization.test.ts

@@ -10,7 +10,7 @@ import { KibanaRequest } from '@kbn/core/server';
 import { ruleTypeRegistryMock } from '../rule_type_registry.mock';
 import { securityMock } from '@kbn/security-plugin/server/mocks';
 import {
-  PluginStartContract as FeaturesStartContract,
+  FeaturesPluginStart as FeaturesStartContract,
   KibanaFeature,
 } from '@kbn/features-plugin/server';
 import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';

x-pack/plugins/alerting/server/authorization/alerting_authorization.ts

@@ -11,7 +11,7 @@ import { KibanaRequest } from '@kbn/core/server';
 import { JsonObject } from '@kbn/utility-types';
 import { KueryNode } from '@kbn/es-query';
 import { SecurityPluginSetup } from '@kbn/security-plugin/server';
-import { PluginStartContract as FeaturesPluginStart } from '@kbn/features-plugin/server';
+import { FeaturesPluginStart } from '@kbn/features-plugin/server';
 import { Space } from '@kbn/spaces-plugin/server';
 import { RegistryRuleType } from '../rule_type_registry';
 import { ALERTING_FEATURE_ID, RuleTypeRegistry } from '../types';

x-pack/plugins/alerting/server/plugin.ts

@@ -48,10 +48,7 @@ import {
   IEventLogService,
   IEventLogClientService,
 } from '@kbn/event-log-plugin/server';
-import {
-  PluginStartContract as FeaturesPluginStart,
-  PluginSetupContract as FeaturesPluginSetup,
-} from '@kbn/features-plugin/server';
+import { FeaturesPluginStart, FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import type { PluginSetup as UnifiedSearchServerPluginSetup } from '@kbn/unified-search-plugin/server';
 import { PluginStart as DataPluginStart } from '@kbn/data-plugin/server';
 import { MonitoringCollectionSetup } from '@kbn/monitoring-collection-plugin/server';

x-pack/plugins/canvas/server/plugin.ts

@@ -15,7 +15,7 @@ import { BfetchServerSetup } from '@kbn/bfetch-plugin/server';
 import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { HomeServerPluginSetup } from '@kbn/home-plugin/server';
 import { EmbeddableSetup } from '@kbn/embeddable-plugin/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { ReportingServerPluginSetup } from '@kbn/reporting-server';
 import { getCanvasFeature } from './feature';
 import { initRoutes } from './routes';

x-pack/plugins/cases/server/authorization/authorization.test.ts

@@ -16,7 +16,7 @@ import type { KibanaRequest } from '@kbn/core/server';
 import type { KibanaFeature } from '@kbn/features-plugin/common';
 import type { AuditLogger, SecurityPluginStart } from '@kbn/security-plugin/server';
 import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
-import type { PluginStartContract as FeaturesPluginStart } from '@kbn/features-plugin/server';
+import type { FeaturesPluginStart } from '@kbn/features-plugin/server';
 
 const createSpacesDisabledFeaturesMock = (disabledFeatures: string[] = []) => {
   const spacesStart: jest.Mocked<SpacesPluginStart> = spacesMock.createStart();

x-pack/plugins/cases/server/authorization/authorization.ts

@@ -9,7 +9,7 @@ import type { SavedObject } from '@kbn/core-saved-objects-server';
 import type { KibanaRequest, Logger } from '@kbn/core/server';
 import Boom from '@hapi/boom';
 import type { SecurityPluginStart } from '@kbn/security-plugin/server';
-import type { PluginStartContract as FeaturesPluginStart } from '@kbn/features-plugin/server';
+import type { FeaturesPluginStart } from '@kbn/features-plugin/server';
 import type { Space, SpacesPluginStart } from '@kbn/spaces-plugin/server';
 import type { AuthFilterHelpers, OwnerEntity } from './types';
 import { getOwnersFilter, groupByAuthorization } from './utils';

x-pack/plugins/cases/server/client/factory.ts

@@ -21,7 +21,7 @@ import type {
   SecurityPluginSetup,
   SecurityPluginStart,
 } from '@kbn/security-plugin/server';
-import type { PluginStartContract as FeaturesPluginStart } from '@kbn/features-plugin/server';
+import type { FeaturesPluginStart } from '@kbn/features-plugin/server';
 import type { PluginStartContract as ActionsPluginStart } from '@kbn/actions-plugin/server';
 import type { LensServerPluginSetup } from '@kbn/lens-plugin/server';
 import type { SpacesPluginStart } from '@kbn/spaces-plugin/server';

x-pack/plugins/cases/server/types.ts

@@ -19,10 +19,7 @@ import type {
   PluginStartContract as ActionsPluginStart,
 } from '@kbn/actions-plugin/server';
 import type { SpacesPluginSetup, SpacesPluginStart } from '@kbn/spaces-plugin/server';
-import type {
-  PluginStartContract as FeaturesPluginStart,
-  PluginSetupContract as FeaturesPluginSetup,
-} from '@kbn/features-plugin/server';
+import type { FeaturesPluginStart, FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import type { LensServerPluginSetup } from '@kbn/lens-plugin/server';
 import type {
   TaskManagerSetupContract,

x-pack/plugins/cloud_integrations/cloud_data_migration/server/types.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 
 export interface Dependencies {
   features: FeaturesPluginSetup;

x-pack/plugins/cross_cluster_replication/server/types.ts

@@ -6,7 +6,7 @@
  */
 
 import { IRouter } from '@kbn/core/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/server';
 import { IndexManagementPluginSetup } from '@kbn/index-management-plugin/server';
 import { RemoteClustersPluginSetup } from '@kbn/remote-clusters-plugin/server';

x-pack/plugins/data_quality/server/types.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 
 export interface Dependencies {
   features: FeaturesPluginSetup;

x-pack/plugins/enterprise_search/server/plugin.ts

@@ -18,7 +18,7 @@ import {
 } from '@kbn/core/server';
 import { CustomIntegrationsPluginSetup } from '@kbn/custom-integrations-plugin/server';
 import { DataPluginStart } from '@kbn/data-plugin/server/plugin';
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { GlobalSearchPluginSetup } from '@kbn/global-search-plugin/server';
 import type { GuidedOnboardingPluginSetup } from '@kbn/guided-onboarding-plugin/server';
 import type { LicensingPluginStart } from '@kbn/licensing-plugin/public';

x-pack/plugins/features/server/index.ts

@@ -22,7 +22,7 @@ export type {
   FeatureElasticsearchPrivileges,
 } from '../common';
 export { KibanaFeature, ElasticsearchFeature } from '../common';
-export type { PluginSetupContract, PluginStartContract } from './plugin';
+export type { FeaturesPluginSetup, FeaturesPluginStart } from './plugin';
 
 export const config: PluginConfigDescriptor<TypeOf<typeof ConfigSchema>> = { schema: ConfigSchema };
 export const plugin = async (initializerContext: PluginInitializerContext) => {

x-pack/plugins/features/server/mocks.ts

@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { PluginSetupContract, PluginStartContract } from './plugin';
+import { FeaturesPluginSetup, FeaturesPluginStart } from './plugin';
 import {
   featurePrivilegeIterator,
   subFeaturePrivilegeIterator,
 } from './feature_privilege_iterator';
 
-const createSetup = (): jest.Mocked<PluginSetupContract> => {
+const createSetup = (): jest.Mocked<FeaturesPluginSetup> => {
   return {
     getKibanaFeatures: jest.fn(),
     getElasticsearchFeatures: jest.fn(),
@@ -23,7 +23,7 @@ const createSetup = (): jest.Mocked<PluginSetupContract> => {
   };
 };
 
-const createStart = (): jest.Mocked<PluginStartContract> => {
+const createStart = (): jest.Mocked<FeaturesPluginStart> => {
   return {
     getKibanaFeatures: jest.fn(),
     getElasticsearchFeatures: jest.fn(),

x-pack/plugins/features/server/plugin.ts

@@ -39,7 +39,7 @@ import {
 /**
  * Describes public Features plugin contract returned at the `setup` stage.
  */
-export interface PluginSetupContract {
+export interface FeaturesPluginSetup {
   registerKibanaFeature(feature: KibanaFeatureConfig): void;
 
   registerElasticsearchFeature(feature: ElasticsearchFeatureConfig): void;
@@ -81,7 +81,7 @@ export interface PluginSetupContract {
   subFeaturePrivilegeIterator: SubFeaturePrivilegeIterator;
 }
 
-export interface PluginStartContract {
+export interface FeaturesPluginStart {
   getElasticsearchFeatures(): ElasticsearchFeature[];
 
   getKibanaFeatures(): KibanaFeature[];
@@ -91,7 +91,7 @@ export interface PluginStartContract {
  * Represents Features Plugin instance that will be managed by the Kibana plugin system.
  */
 export class FeaturesPlugin
-  implements Plugin<RecursiveReadonly<PluginSetupContract>, RecursiveReadonly<PluginStartContract>>
+  implements Plugin<RecursiveReadonly<FeaturesPluginSetup>, RecursiveReadonly<FeaturesPluginStart>>
 {
   private readonly logger: Logger;
   private readonly featureRegistry: FeatureRegistry = new FeatureRegistry();
@@ -102,7 +102,7 @@ export class FeaturesPlugin
     this.logger = this.initializerContext.logger.get();
   }
 
-  public setup(core: CoreSetup): RecursiveReadonly<PluginSetupContract> {
+  public setup(core: CoreSetup): RecursiveReadonly<FeaturesPluginSetup> {
     defineRoutes({
       router: core.http.createRouter(),
       featureRegistry: this.featureRegistry,
@@ -126,7 +126,7 @@ export class FeaturesPlugin
     });
   }
 
-  public start(core: CoreStart): RecursiveReadonly<PluginStartContract> {
+  public start(core: CoreStart): RecursiveReadonly<FeaturesPluginStart> {
     this.registerOssFeatures(core.savedObjects);
 
     const { overrides } = this.initializerContext.config.get<ConfigType>();

x-pack/plugins/fleet/server/plugin.ts

@@ -41,7 +41,7 @@ import type {
   SecurityPluginSetup,
   SecurityPluginStart,
 } from '@kbn/security-plugin/server';
-import type { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import type { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import type { FieldsMetadataServerSetup } from '@kbn/fields-metadata-plugin/server';
 import type {
   TaskManagerSetupContract,

x-pack/plugins/graph/server/plugin.ts

@@ -10,7 +10,7 @@ import { Plugin, CoreSetup, CoreStart, PluginInitializerContext } from '@kbn/cor
 import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
 import { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/server';
 import { HomeServerPluginSetup } from '@kbn/home-plugin/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { ContentManagementServerSetup } from '@kbn/content-management-plugin/server';
 import { LicenseState } from './lib/license_state';
 import { registerSearchRoute } from './routes/search';

x-pack/plugins/index_lifecycle_management/server/types.ts

@@ -7,7 +7,7 @@
 
 import { IRouter } from '@kbn/core/server';
 
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
 import { IndexManagementPluginSetup } from '@kbn/index-management-plugin/server';
 import { License } from './services';

x-pack/plugins/index_management/server/types.ts

@@ -7,7 +7,7 @@
 
 import { IRouter } from '@kbn/core/server';
 
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
 import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { IndexDataEnricher } from './services';

x-pack/plugins/ingest_pipelines/server/types.ts

@@ -7,7 +7,7 @@
 
 import { IRouter } from '@kbn/core/server';
 import { SecurityPluginSetup } from '@kbn/security-plugin/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { handleEsError } from './shared_imports';
 
 export interface Dependencies {

x-pack/plugins/license_management/server/types.ts

@@ -7,7 +7,7 @@
 
 import { IScopedClusterClient, IRouter } from '@kbn/core/server';
 
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { LicensingPluginStart } from '@kbn/licensing-plugin/server';
 import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { handleEsError } from './shared_imports';

x-pack/plugins/logstash/server/plugin.ts

@@ -7,7 +7,7 @@
 
 import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server';
 import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { registerRoutes } from './routes';
 
 interface SetupDeps {

x-pack/plugins/maps/server/types.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginSetupContract as FeaturesPluginSetupContract } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { HomeServerPluginSetup } from '@kbn/home-plugin/server';
 import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
@@ -20,7 +20,7 @@ import type { ContentManagementServerSetup } from '@kbn/content-management-plugi
 
 export interface SetupDeps {
   data: DataPluginSetup;
-  features: FeaturesPluginSetupContract;
+  features: FeaturesPluginSetup;
   usageCollection?: UsageCollectionSetup;
   home?: HomeServerPluginSetup;
   licensing: LicensingPluginSetup;

x-pack/plugins/ml/server/types.ts

@@ -9,7 +9,7 @@ import type { HomeServerPluginSetup } from '@kbn/home-plugin/server';
 import type { IRouter } from '@kbn/core/server';
 import type { CloudSetup } from '@kbn/cloud-plugin/server';
 import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
-import type { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import type { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import type { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/server';
 import type { SpacesPluginSetup, SpacesPluginStart } from '@kbn/spaces-plugin/server';
 

x-pack/plugins/monitoring/server/types.ts

@@ -31,7 +31,7 @@ import {
 import { InfraPluginSetup, InfraRequestHandlerContext } from '@kbn/infra-plugin/server';
 import { PluginSetupContract as AlertingPluginSetup } from '@kbn/alerting-plugin/server';
 import { LicensingPluginStart } from '@kbn/licensing-plugin/server';
-import { PluginSetupContract as FeaturesPluginSetupContract } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
 import { CloudSetup } from '@kbn/cloud-plugin/server';
 import { RouteConfig, RouteMethod, Headers } from '@kbn/core/server';
@@ -53,7 +53,7 @@ export interface MonitoringLicenseService {
 export interface PluginsSetup {
   encryptedSavedObjects?: EncryptedSavedObjectsPluginSetup;
   usageCollection?: UsageCollectionSetup;
-  features: FeaturesPluginSetupContract;
+  features: FeaturesPluginSetup;
   alerting?: AlertingPluginSetupContract;
   infra: InfraPluginSetup;
   cloud?: CloudSetup;

x-pack/plugins/observability_solution/apm/server/types.ts

@@ -26,10 +26,7 @@ import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { ActionsPlugin } from '@kbn/actions-plugin/server';
 import { AlertingPlugin } from '@kbn/alerting-plugin/server';
 import { CloudSetup } from '@kbn/cloud-plugin/server';
-import {
-  PluginSetupContract as FeaturesPluginSetup,
-  PluginStartContract as FeaturesPluginStart,
-} from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup, FeaturesPluginStart } from '@kbn/features-plugin/server';
 import { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/server';
 import { MlPluginSetup, MlPluginStart } from '@kbn/ml-plugin/server';
 import { ObservabilityPluginSetup } from '@kbn/observability-plugin/server';

x-pack/plugins/observability_solution/infra/server/lib/adapters/framework/adapter_types.ts

@@ -18,7 +18,7 @@ import {
 import { PluginStart as DataViewsPluginStart } from '@kbn/data-views-plugin/server';
 import { HomeServerPluginSetup } from '@kbn/home-plugin/server';
 import { VisTypeTimeseriesSetup } from '@kbn/vis-type-timeseries-plugin/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { SpacesPluginSetup } from '@kbn/spaces-plugin/server';
 import { PluginSetupContract as AlertingPluginContract } from '@kbn/alerting-plugin/server';
 import { MlPluginSetup } from '@kbn/ml-plugin/server';

x-pack/plugins/observability_solution/metrics_data_access/server/lib/adapters/framework/adapter_types.ts

@@ -18,7 +18,7 @@ import {
 import { PluginStart as DataViewsPluginStart } from '@kbn/data-views-plugin/server';
 import { HomeServerPluginSetup } from '@kbn/home-plugin/server';
 import { VisTypeTimeseriesSetup } from '@kbn/vis-type-timeseries-plugin/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { SpacesPluginSetup } from '@kbn/spaces-plugin/server';
 import { PluginSetupContract as AlertingPluginContract } from '@kbn/alerting-plugin/server';
 import { MlPluginSetup } from '@kbn/ml-plugin/server';

x-pack/plugins/observability_solution/observability/server/plugin.ts

@@ -20,7 +20,7 @@ import {
   PluginInitializerContext,
 } from '@kbn/core/server';
 import { LogsExplorerLocatorParams, LOGS_EXPLORER_LOCATOR_ID } from '@kbn/deeplinks-observability';
-import { PluginSetupContract as FeaturesSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { hiddenTypes as filesSavedObjectTypes } from '@kbn/files-plugin/server/saved_objects';
 import type { GuidedOnboardingPluginSetup } from '@kbn/guided-onboarding-plugin/server';
 import { i18n } from '@kbn/i18n';
@@ -60,7 +60,7 @@ export type ObservabilityPluginSetup = ReturnType<ObservabilityPlugin['setup']>;
 
 interface PluginSetup {
   alerting: PluginSetupContract;
-  features: FeaturesSetup;
+  features: FeaturesPluginSetup;
   guidedOnboarding?: GuidedOnboardingPluginSetup;
   ruleRegistry: RuleRegistryPluginSetupContract;
   share: SharePluginSetup;

x-pack/plugins/observability_solution/observability_ai_assistant/server/types.ts

@@ -4,10 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type {
-  PluginStartContract as FeaturesPluginStart,
-  PluginSetupContract as FeaturesPluginSetup,
-} from '@kbn/features-plugin/server';
+import type { FeaturesPluginStart, FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import type {
   PluginSetupContract as ActionsPluginSetup,
   PluginStartContract as ActionsPluginStart,

x-pack/plugins/observability_solution/observability_ai_assistant_app/server/types.ts

@@ -17,10 +17,7 @@ import type {
   DataViewsServerPluginSetup,
   DataViewsServerPluginStart,
 } from '@kbn/data-views-plugin/server';
-import type {
-  PluginStartContract as FeaturesPluginStart,
-  PluginSetupContract as FeaturesPluginSetup,
-} from '@kbn/features-plugin/server';
+import type { FeaturesPluginStart, FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import type { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/server';
 import type {
   ObservabilityAIAssistantServerSetup,

x-pack/plugins/observability_solution/profiling/server/types.ts

@@ -6,7 +6,7 @@
  */
 
 import { CustomRequestHandlerContext } from '@kbn/core-http-request-handler-context-server';
-import type { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import type { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import type { ObservabilityPluginSetup } from '@kbn/observability-plugin/server';
 import { SpacesPluginStart, SpacesPluginSetup } from '@kbn/spaces-plugin/server';
 import { CloudSetup, CloudStart } from '@kbn/cloud-plugin/server';

x-pack/plugins/observability_solution/slo/server/plugin.ts

@@ -16,7 +16,7 @@ import {
   SavedObjectsClient,
 } from '@kbn/core/server';
 import { PluginSetupContract, PluginStartContract } from '@kbn/alerting-plugin/server';
-import { PluginSetupContract as FeaturesSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import {
   RuleRegistryPluginSetupContract,
   RuleRegistryPluginStartContract,
@@ -49,7 +49,7 @@ export interface PluginSetup {
   alerting: PluginSetupContract;
   ruleRegistry: RuleRegistryPluginSetupContract;
   share: SharePluginSetup;
-  features: FeaturesSetup;
+  features: FeaturesPluginSetup;
   taskManager: TaskManagerSetupContract;
   spaces?: SpacesPluginSetup;
   cloud?: CloudSetup;

x-pack/plugins/observability_solution/synthetics/server/types.ts

@@ -30,7 +30,7 @@ import {
   EncryptedSavedObjectsPluginSetup,
   EncryptedSavedObjectsPluginStart,
 } from '@kbn/encrypted-saved-objects-plugin/server';
-import { PluginSetupContract } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { RuleRegistryPluginSetupContract } from '@kbn/rule-registry-plugin/server';
 import {
   TaskManagerSetupContract,
@@ -63,7 +63,7 @@ export interface SyntheticsServerSetup {
 }
 
 export interface SyntheticsPluginsSetupDependencies {
-  features: PluginSetupContract;
+  features: FeaturesPluginSetup;
   alerting: any;
   observability: ObservabilityPluginSetup;
   usageCollection: UsageCollectionSetup;

x-pack/plugins/observability_solution/uptime/server/legacy_uptime/lib/adapters/framework/adapter_types.ts

@@ -16,7 +16,7 @@ import {
   TaskManagerSetupContract,
   TaskManagerStartContract,
 } from '@kbn/task-manager-plugin/server';
-import { PluginSetupContract } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { MlPluginSetup as MlSetup } from '@kbn/ml-plugin/server';
 import { RuleRegistryPluginSetupContract } from '@kbn/rule-registry-plugin/server';
 import { SecurityPluginStart } from '@kbn/security-plugin/server';
@@ -50,7 +50,7 @@ export interface UptimeServerSetup {
 }
 
 export interface UptimeCorePluginsSetup {
-  features: PluginSetupContract;
+  features: FeaturesPluginSetup;
   alerting: any;
   observability: ObservabilityPluginSetup;
   usageCollection: UsageCollectionSetup;

x-pack/plugins/osquery/server/types.ts

@@ -13,7 +13,7 @@ import type {
 } from '@kbn/data-plugin/server';
 
 import type { FleetStartContract } from '@kbn/fleet-plugin/server';
-import type { PluginSetupContract } from '@kbn/features-plugin/server';
+import type { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import type { SecurityPluginStart } from '@kbn/security-plugin/server';
 import type {
   TaskManagerSetupContract as TaskManagerPluginSetup,
@@ -36,7 +36,7 @@ export interface SetupPlugins {
   actions: ActionsPlugin['setup'];
   cases: CasesServerSetup;
   data: DataPluginSetup;
-  features: PluginSetupContract;
+  features: FeaturesPluginSetup;
   security: SecurityPluginStart;
   taskManager?: TaskManagerPluginSetup;
   telemetry?: TelemetryPluginSetup;

x-pack/plugins/remote_clusters/server/types.ts

@@ -7,7 +7,7 @@
 
 import { IRouter } from '@kbn/core/server';
 
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
 import { CloudSetup } from '@kbn/cloud-plugin/server';
 

x-pack/plugins/reporting/server/core.ts

@@ -25,7 +25,7 @@ import type {
 } from '@kbn/core/server';
 import type { PluginStart as DataPluginStart } from '@kbn/data-plugin/server';
 import type { DiscoverServerPluginStart } from '@kbn/discover-plugin/server';
-import type { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import type { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import type { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
 import type { LicensingPluginStart } from '@kbn/licensing-plugin/server';
 import type { ReportingServerInfo } from '@kbn/reporting-common/types';

x-pack/plugins/reporting/server/features.ts

@@ -7,7 +7,7 @@
 
 import { DEFAULT_APP_CATEGORIES, type Logger } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
-import type { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import type { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 
 interface FeatureRegistrationOpts {
   features: FeaturesPluginSetup;

x-pack/plugins/reporting/server/plugin.test.ts

@@ -25,7 +25,7 @@ import { ReportingPlugin } from './plugin';
 import { createMockPluginSetup, createMockPluginStart } from './test_helpers';
 import type { ReportingSetupDeps } from './types';
 import { ExportTypesRegistry } from '@kbn/reporting-server/export_types_registry';
-import { PluginSetupContract as FeaturesPluginSetupContract } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 
 const sleep = (time: number) => new Promise((r) => setTimeout(r, time));
 
@@ -38,7 +38,7 @@ describe('Reporting Plugin', () => {
   let pluginStart: ReportingInternalStart;
   let logger: jest.Mocked<Logger>;
   let plugin: ReportingPlugin;
-  let featuresSetup: jest.Mocked<FeaturesPluginSetupContract>;
+  let featuresSetup: jest.Mocked<FeaturesPluginSetup>;
 
   beforeEach(async () => {
     jest.clearAllMocks();

x-pack/plugins/reporting/server/types.ts

@@ -9,7 +9,7 @@ import { CustomRequestHandlerContext } from '@kbn/core-http-request-handler-cont
 import { IRouter } from '@kbn/core-http-server';
 import type { DataPluginStart } from '@kbn/data-plugin/server/plugin';
 import type { DiscoverServerPluginStart } from '@kbn/discover-plugin/server';
-import type { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import type { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import type { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
 import type { LicensingPluginStart } from '@kbn/licensing-plugin/server';
 import type { UrlOrUrlLocatorTuple } from '@kbn/reporting-common/types';

x-pack/plugins/rollup/server/types.ts

@@ -11,7 +11,7 @@ import { VisTypeTimeseriesSetup } from '@kbn/vis-type-timeseries-plugin/server';
 
 import { getCapabilitiesForRollupIndices } from '@kbn/data-plugin/server';
 import { IndexManagementPluginSetup } from '@kbn/index-management-plugin/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { DataViewsServerPluginSetup } from '@kbn/data-views-plugin/server';
 import { PluginSetup as DataPluginSetup } from '@kbn/data-plugin/server';
 import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';

x-pack/plugins/saved_objects_tagging/server/plugin.ts

@@ -6,7 +6,7 @@
  */
 
 import { CoreSetup, CoreStart, Plugin } from '@kbn/core/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/server';
 import { savedObjectsTaggingFeature } from './features';

x-pack/plugins/security/server/authorization/app_authorization.test.ts

@@ -12,7 +12,7 @@ import {
   loggingSystemMock,
 } from '@kbn/core/server/mocks';
 import type {
-  PluginSetupContract as FeaturesSetupContract,
+  FeaturesPluginSetup as FeaturesSetupContract,
   KibanaFeature,
 } from '@kbn/features-plugin/server';
 import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';

x-pack/plugins/security/server/authorization/app_authorization.ts

@@ -6,7 +6,7 @@
  */
 
 import type { HttpServiceSetup, Logger } from '@kbn/core/server';
-import type { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import type { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import type { AuthorizationServiceSetup } from '@kbn/security-plugin-types-server';
 
 class ProtectedApplications {

x-pack/plugins/security/server/authorization/authorization_service.tsx

@@ -22,8 +22,8 @@ import type {
 } from '@kbn/core/server';
 import type { Capabilities as UICapabilities } from '@kbn/core/types';
 import type {
-  PluginSetupContract as FeaturesPluginSetup,
-  PluginStartContract as FeaturesPluginStart,
+  FeaturesPluginSetup as FeaturesPluginSetup,
+  FeaturesPluginStart as FeaturesPluginStart,
 } from '@kbn/features-plugin/server';
 import type {
   AuthorizationMode,

x-pack/plugins/security/server/authorization/privileges/privileges.ts

@@ -11,10 +11,7 @@ import type {
   FeatureKibanaPrivileges,
   FeatureKibanaPrivilegesReference,
 } from '@kbn/features-plugin/common';
-import type {
-  PluginSetupContract as FeaturesPluginSetup,
-  KibanaFeature,
-} from '@kbn/features-plugin/server';
+import type { FeaturesPluginSetup, KibanaFeature } from '@kbn/features-plugin/server';
 
 import { featurePrivilegeBuilderFactory } from './feature_privilege_builder';
 import type { SecurityLicense } from '../../../common';

x-pack/plugins/security/server/plugin.ts

@@ -18,10 +18,7 @@ import type {
   Plugin,
   PluginInitializerContext,
 } from '@kbn/core/server';
-import type {
-  PluginSetupContract as FeaturesPluginSetup,
-  PluginStartContract as FeaturesPluginStart,
-} from '@kbn/features-plugin/server';
+import type { FeaturesPluginSetup, FeaturesPluginStart } from '@kbn/features-plugin/server';
 import type { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/server';
 import type {
   AuditServiceSetup,

x-pack/plugins/security_solution/server/lib/product_features_service/mocks.ts

@@ -6,7 +6,7 @@
  */
 
 import type { Logger } from '@kbn/core/server';
-import type { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import type { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { loggingSystemMock } from '@kbn/core-logging-server-mocks';
 import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
 

x-pack/plugins/security_solution/server/lib/product_features_service/product_features.test.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { PluginSetupContract } from '@kbn/features-plugin/server';
+import type { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { loggingSystemMock } from '@kbn/core-logging-server-mocks';
 import { ProductFeatures } from './product_features';
 import type {
@@ -150,7 +150,7 @@ describe('ProductFeatures', () => {
       const featuresSetup = {
         registerKibanaFeature: jest.fn(),
         getKibanaFeatures: jest.fn(),
-      } as unknown as PluginSetupContract;
+      } as unknown as FeaturesPluginSetup;
 
       const productFeatures = new ProductFeatures(
         loggingSystemMock.create().get('mock'),
@@ -171,7 +171,7 @@ describe('ProductFeatures', () => {
       const featuresSetup = {
         registerKibanaFeature: jest.fn(),
         getKibanaFeatures: jest.fn(),
-      } as unknown as PluginSetupContract;
+      } as unknown as FeaturesPluginSetup;
 
       const productFeatures = new ProductFeatures(
         loggingSystemMock.create().get('mock'),
@@ -195,7 +195,7 @@ describe('ProductFeatures', () => {
       const featuresSetup = {
         registerKibanaFeature: jest.fn(),
         getKibanaFeatures: jest.fn(),
-      } as unknown as PluginSetupContract;
+      } as unknown as FeaturesPluginSetup;
 
       const productFeatures = new ProductFeatures(
         loggingSystemMock.create().get('mock'),
@@ -222,7 +222,7 @@ describe('ProductFeatures', () => {
       const featuresSetup = {
         registerKibanaFeature: jest.fn(),
         getKibanaFeatures: jest.fn(),
-      } as unknown as PluginSetupContract;
+      } as unknown as FeaturesPluginSetup;
 
       const productFeatures = new ProductFeatures(
         loggingSystemMock.create().get('mock'),
@@ -250,7 +250,7 @@ describe('ProductFeatures', () => {
     it('should register base privilege actions', () => {
       const featuresSetup = {
         registerKibanaFeature: jest.fn(),
-      } as unknown as PluginSetupContract;
+      } as unknown as FeaturesPluginSetup;
 
       const productFeatures = new ProductFeatures(
         loggingSystemMock.create().get('mock'),
@@ -276,7 +276,7 @@ describe('ProductFeatures', () => {
     it('should register config privilege actions', () => {
       const featuresSetup = {
         registerKibanaFeature: jest.fn(),
-      } as unknown as PluginSetupContract;
+      } as unknown as FeaturesPluginSetup;
 
       const productFeatures = new ProductFeatures(
         loggingSystemMock.create().get('mock'),
@@ -304,7 +304,7 @@ describe('ProductFeatures', () => {
     it('should register config sub-feature privilege actions', () => {
       const featuresSetup = {
         registerKibanaFeature: jest.fn(),
-      } as unknown as PluginSetupContract;
+      } as unknown as FeaturesPluginSetup;
 
       const productFeatures = new ProductFeatures(
         loggingSystemMock.create().get('mock'),
@@ -335,7 +335,7 @@ describe('ProductFeatures', () => {
     it('should register default and config sub-feature privilege actions', () => {
       const featuresSetup = {
         registerKibanaFeature: jest.fn(),
-      } as unknown as PluginSetupContract;
+      } as unknown as FeaturesPluginSetup;
 
       const productFeatures = new ProductFeatures(
         loggingSystemMock.create().get('mock'),

x-pack/plugins/security_solution/server/lib/product_features_service/product_features.ts

@@ -9,7 +9,7 @@ import type { Logger } from '@kbn/core/server';
 import type {
   FeatureKibanaPrivileges,
   KibanaFeatureConfig,
-  PluginSetupContract as FeaturesPluginSetup,
+  FeaturesPluginSetup,
 } from '@kbn/features-plugin/server';
 import type {
   ProductFeaturesConfig,

x-pack/plugins/security_solution/server/lib/product_features_service/product_features_service.ts

@@ -13,7 +13,7 @@
 
 import type { HttpServiceSetup, Logger } from '@kbn/core/server';
 import { hiddenTypes as filesSavedObjectTypes } from '@kbn/files-plugin/server/saved_objects';
-import type { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import type { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import type { ProductFeatureKeyType } from '@kbn/security-solution-features';
 import {
   getAssistantFeature,

x-pack/plugins/security_solution/server/plugin_contract.ts

@@ -23,7 +23,7 @@ import type {
 import type { CasesServerStart, CasesServerSetup } from '@kbn/cases-plugin/server';
 import type { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
 import type { IEventLogClientService, IEventLogService } from '@kbn/event-log-plugin/server';
-import type { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import type { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import type { FleetStartContract as FleetPluginStart } from '@kbn/fleet-plugin/server';
 import type { LicensingPluginStart, LicensingPluginSetup } from '@kbn/licensing-plugin/server';
 import type { ListPluginSetup } from '@kbn/lists-plugin/server';

x-pack/plugins/security_solution_serverless/server/types.ts

@@ -6,7 +6,7 @@
  */
 import type { CoreSetup, ElasticsearchClient, Logger, LoggerFactory } from '@kbn/core/server';
 import type { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/server';
-import type { PluginSetupContract, PluginStartContract } from '@kbn/features-plugin/server';
+import type { FeaturesPluginSetup, FeaturesPluginStart } from '@kbn/features-plugin/server';
 import type {
   PluginSetup as SecuritySolutionPluginSetup,
   PluginStart as SecuritySolutionPluginStart,
@@ -36,7 +36,7 @@ export interface SecuritySolutionServerlessPluginSetupDeps {
   securitySolution: SecuritySolutionPluginSetup;
   securitySolutionEss: SecuritySolutionEssPluginSetup;
   serverless: ServerlessPluginSetup;
-  features: PluginSetupContract;
+  features: FeaturesPluginSetup;
   taskManager: TaskManagerSetupContract;
   cloud: CloudSetup;
   actions: ActionsPluginSetupContract;
@@ -46,7 +46,7 @@ export interface SecuritySolutionServerlessPluginSetupDeps {
 export interface SecuritySolutionServerlessPluginStartDeps {
   security: SecurityPluginStart;
   securitySolution: SecuritySolutionPluginStart;
-  features: PluginStartContract;
+  features: FeaturesPluginStart;
   taskManager: TaskManagerStartContract;
   fleet: FleetStartContract;
 }

x-pack/plugins/snapshot_restore/server/types.ts

@@ -9,7 +9,7 @@ import type { IRouter, CustomRequestHandlerContext, IScopedClusterClient } from
 import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
 import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { CloudSetup } from '@kbn/cloud-plugin/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { License } from './services';
 import { wrapEsError } from './lib';
 import { handleEsError } from './shared_imports';

x-pack/plugins/spaces/server/plugin.ts

@@ -16,10 +16,7 @@ import type {
   Plugin,
   PluginInitializerContext,
 } from '@kbn/core/server';
-import type {
-  PluginSetupContract as FeaturesPluginSetup,
-  PluginStartContract as FeaturesPluginStart,
-} from '@kbn/features-plugin/server';
+import type { FeaturesPluginSetup, FeaturesPluginStart } from '@kbn/features-plugin/server';
 import type { HomeServerPluginSetup } from '@kbn/home-plugin/server';
 import type { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
 import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';

x-pack/plugins/stack_alerts/server/types.ts

@@ -15,7 +15,7 @@ export type {
   RuleExecutorOptions,
   RuleTypeParams,
 } from '@kbn/alerting-plugin/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 
 // this plugin's dependendencies
 export interface StackAlertsDeps {

x-pack/plugins/transform/server/types.ts

@@ -8,7 +8,7 @@
 import type { IRouter, CoreStart } from '@kbn/core/server';
 import type { PluginStart as DataViewsServerPluginStart } from '@kbn/data-views-plugin/server';
 import type { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
-import type { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import type { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import type { AlertingPlugin } from '@kbn/alerting-plugin/server';
 import type { FieldFormatsSetup, FieldFormatsStart } from '@kbn/field-formats-plugin/server';
 import type { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/server';

x-pack/plugins/upgrade_assistant/server/plugin.ts

@@ -18,7 +18,7 @@ import {
 import { SecurityPluginStart } from '@kbn/security-plugin/server';
 import { LogsSharedPluginSetup } from '@kbn/logs-shared-plugin/server';
 
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
 import { DEPRECATION_LOGS_SOURCE_ID, DEPRECATION_LOGS_INDEX } from '../common/constants';

x-pack/plugins/watcher/server/types.ts

@@ -8,7 +8,7 @@
 import { SemVer } from 'semver';
 import type { IRouter } from '@kbn/core/server';
 
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/server';
 import { License, handleEsError } from './shared_imports';
 

x-pack/test/alerting_api_integration/common/plugins/actions_simulators/server/plugin.ts

@@ -10,7 +10,7 @@ import https from 'https';
 import { Plugin, CoreSetup } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { EncryptedSavedObjectsPluginStart } from '@kbn/encrypted-saved-objects-plugin/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import {
   PluginSetupContract as ActionsPluginSetupContract,
   PluginStartContract as ActionsPluginStartContract,

x-pack/test/alerting_api_integration/common/plugins/alerts/server/plugin.ts

@@ -17,7 +17,7 @@ import {
   TaskManagerStartContract,
 } from '@kbn/task-manager-plugin/server/plugin';
 import { EncryptedSavedObjectsPluginStart } from '@kbn/encrypted-saved-objects-plugin/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 import { SecurityPluginStart } from '@kbn/security-plugin/server';
 import { PluginStartContract as ActionsPluginStart } from '@kbn/actions-plugin/server';

x-pack/test/alerting_api_integration/common/plugins/alerts_restricted/server/plugin.ts

@@ -9,7 +9,7 @@ import { Plugin, CoreSetup } from '@kbn/core/server';
 import { PluginSetupContract as ActionsPluginSetup } from '@kbn/actions-plugin/server/plugin';
 import { PluginSetupContract as AlertingPluginSetup } from '@kbn/alerting-plugin/server/plugin';
 import { EncryptedSavedObjectsPluginStart } from '@kbn/encrypted-saved-objects-plugin/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { RULE_SAVED_OBJECT_TYPE } from '@kbn/alerting-plugin/server';
 import { defineAlertTypes } from './alert_types';
 

x-pack/test/cases_api_integration/common/plugins/cases/server/plugin.ts

@@ -6,7 +6,7 @@
  */
 
 import { Plugin, CoreSetup, CoreStart, PluginInitializerContext, Logger } from '@kbn/core/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 import { SecurityPluginStart } from '@kbn/security-plugin/server';
 import type { CasesServerStart, CasesServerSetup } from '@kbn/cases-plugin/server';

x-pack/test/cases_api_integration/common/plugins/observability/server/plugin.ts

@@ -7,7 +7,7 @@
 
 import { Plugin, CoreSetup } from '@kbn/core/server';
 import { hiddenTypes as filesSavedObjectTypes } from '@kbn/files-plugin/server/saved_objects';
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 import { SecurityPluginStart } from '@kbn/security-plugin/server';
 

x-pack/test/cases_api_integration/common/plugins/security_solution/server/plugin.ts

@@ -7,7 +7,7 @@
 
 import { Plugin, CoreSetup } from '@kbn/core/server';
 import { hiddenTypes as filesSavedObjectTypes } from '@kbn/files-plugin/server/saved_objects';
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 import { SecurityPluginStart } from '@kbn/security-plugin/server';
 

x-pack/test/functional_execution_context/plugins/alerts/server/plugin.ts

@@ -9,7 +9,7 @@ import apmAgent from 'elastic-apm-node';
 import type { Plugin, CoreSetup } from '@kbn/core/server';
 import { PluginSetupContract as AlertingPluginSetup } from '@kbn/alerting-plugin/server/plugin';
 import { EncryptedSavedObjectsPluginStart } from '@kbn/encrypted-saved-objects-plugin/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 import { SecurityPluginStart } from '@kbn/security-plugin/server';
 

x-pack/test/functional_with_es_ssl/plugins/alerts/server/plugin.ts

@@ -11,7 +11,7 @@ import {
   RuleType,
   RuleTypeParams,
 } from '@kbn/alerting-plugin/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 
 // this plugin's dependendencies
 export interface AlertingExampleDeps {

x-pack/test/security_api_integration/plugins/user_profiles_consumer/server/index.ts

@@ -6,10 +6,7 @@
  */
 
 import type { PluginInitializer, Plugin, CoreSetup } from '@kbn/core/server';
-import {
-  PluginSetupContract as FeaturesPluginSetup,
-  PluginStartContract as FeaturesPluginStart,
-} from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup, FeaturesPluginStart } from '@kbn/features-plugin/server';
 import { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/server';
 import { SpacesPluginSetup, SpacesPluginStart } from '@kbn/spaces-plugin/server';
 import { initRoutes } from './init_routes';

x-pack/test/ui_capabilities/common/plugins/foo_plugin/server/index.ts

@@ -6,12 +6,12 @@
  */
 
 import { CoreSetup, Plugin } from '@kbn/core/server';
-import { PluginSetupContract as FeaturesPluginSetupContract } from '@kbn/features-plugin/server';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 
 export const plugin = async () => new FooPlugin();
 
 interface SetupDeps {
-  features: FeaturesPluginSetupContract;
+  features: FeaturesPluginSetup;
 }
 
 class FooPlugin implements Plugin {