diff --git a/packages/block-editor/src/components/block-inspector/index.jsx b/packages/block-editor/src/components/block-inspector/index.jsx
index 32847cbe03f409..678f95afb90bdc 100644
--- a/packages/block-editor/src/components/block-inspector/index.jsx
+++ b/packages/block-editor/src/components/block-inspector/index.jsx
@@ -27,7 +27,7 @@ import { BlockInspectorPreTabsSlot } from './inspector-pre-tabs-slot-fill';
 import { default as InspectorControlsTabs } from '../inspector-controls-tabs';
 import { SectionStyleControls } from '../inspector-controls-tabs/styles-tab';
 import useInspectorControlsTabs from '../inspector-controls-tabs/use-inspector-controls-tabs';
-import { PrivateInspectorControlsStyleStatesAdvanced } from '../inspector-controls/groups';
+import { PrivateInspectorControlsStyleStateAdvanced } from '../inspector-controls/groups';
 import InspectorControlsLastItem from '../inspector-controls/last-item';
 import AdvancedControls from '../inspector-controls-tabs/advanced-controls-panel';
 import PositionControls from '../inspector-controls-tabs/position-controls-panel';
@@ -152,10 +152,10 @@ function StyleStateInspectorSlots( {
 				</>
 			) }
 			{ ! isDefaultBlockStyleState( selectedBlockStyleState ) && (
-				<InspectorControls.Slot group="styleStates" />
+				<InspectorControls.Slot group="style-state" />
 			) }
 			{ ! isDefaultBlockStyleState( selectedBlockStyleState ) && (
-				<PrivateInspectorControlsStyleStatesAdvanced.Slot />
+				<PrivateInspectorControlsStyleStateAdvanced.Slot />
 			) }
 		</>
 	);
diff --git a/packages/block-editor/src/components/inspector-controls/groups.js b/packages/block-editor/src/components/inspector-controls/groups.js
index 84527f4570fd5d..f85b52378b917b 100644
--- a/packages/block-editor/src/components/inspector-controls/groups.js
+++ b/packages/block-editor/src/components/inspector-controls/groups.js
@@ -18,8 +18,8 @@ const InspectorControlsPosition = createSlotFill( 'InspectorControlsPosition' );
 const InspectorControlsTypography = createSlotFill(
 	'InspectorControlsTypography'
 );
-const InspectorControlsStyleStates = createSlotFill(
-	'InspectorControlsStyleStates'
+const InspectorControlsStyleState = createSlotFill(
+	'InspectorControlsStyleState'
 );
 const InspectorControlsListView = createSlotFill( 'InspectorControlsListView' );
 const InspectorControlsStyles = createSlotFill( 'InspectorControlsStyles' );
@@ -44,7 +44,7 @@ const groups = {
 	settings: InspectorControlsDefault, // Alias for default.
 	styles: InspectorControlsStyles,
 	typography: InspectorControlsTypography,
-	styleStates: InspectorControlsStyleStates,
+	'style-state': InspectorControlsStyleState,
 };
 
 export default groups;
@@ -56,6 +56,6 @@ export const PrivateInspectorControlsAllowedBlocks = createSlotFill(
 
 // Private slot for the "Advanced" panel shown while editing a style state, so
 // it always renders after every other style state panel.
-export const PrivateInspectorControlsStyleStatesAdvanced = createSlotFill(
-	Symbol( 'PrivateInspectorControlsStyleStatesAdvanced' )
+export const PrivateInspectorControlsStyleStateAdvanced = createSlotFill(
+	Symbol( 'PrivateInspectorControlsStyleStateAdvanced' )
 );
diff --git a/packages/block-editor/src/hooks/custom-css.jsx b/packages/block-editor/src/hooks/custom-css.jsx
index 7130ed2ce27a24..65e0c662bf0773 100644
--- a/packages/block-editor/src/hooks/custom-css.jsx
+++ b/packages/block-editor/src/hooks/custom-css.jsx
@@ -11,7 +11,7 @@ import {
 import { store as noticesStore } from '@wordpress/notices';
 import { useBlockEditingMode } from '../components/block-editing-mode';
 import InspectorControls from '../components/inspector-controls';
-import { PrivateInspectorControlsStyleStatesAdvanced } from '../components/inspector-controls/groups';
+import { PrivateInspectorControlsStyleStateAdvanced } from '../components/inspector-controls/groups';
 import AdvancedPanel, {
 	validateCSS,
 } from '../components/global-styles/advanced-panel';
@@ -181,9 +181,9 @@ function CustomCSSControl( {
 
 	if ( isStateSelected ) {
 		return (
-			<PrivateInspectorControlsStyleStatesAdvanced.Fill>
+			<PrivateInspectorControlsStyleStateAdvanced.Fill>
 				<PanelBody title={ __( 'Advanced' ) }>{ panel }</PanelBody>
-			</PrivateInspectorControlsStyleStatesAdvanced.Fill>
+			</PrivateInspectorControlsStyleStateAdvanced.Fill>
 		);
 	}
 
diff --git a/packages/block-library/src/gallery/edit.jsx b/packages/block-library/src/gallery/edit.jsx
index 2aafe821520e3c..e1e2c641042fdf 100644
--- a/packages/block-library/src/gallery/edit.jsx
+++ b/packages/block-library/src/gallery/edit.jsx
@@ -917,7 +917,7 @@ export default function GalleryEdit( props ) {
 			<InspectorControls
 				group={
 					isViewportStyleState && hasViewportSettings
-						? 'styleStates'
+						? 'style-state'
 						: 'default'
 				}
 			>