diff --git a/plugins/woocommerce-blocks/assets/js/blocks/product-categories/block.js b/plugins/woocommerce-blocks/assets/js/blocks/product-categories/block.js
index c296c657d62..83eebde0117 100644
--- a/plugins/woocommerce-blocks/assets/js/blocks/product-categories/block.js
+++ b/plugins/woocommerce-blocks/assets/js/blocks/product-categories/block.js
@@ -70,7 +70,7 @@ class ProductCategoriesBlock extends Component {
 	}
 
 	render() {
-		const { attributes, categories, ComponentId } = this.props;
+		const { attributes, categories, componentId } = this.props;
 		const { className, isDropdown } = attributes;
 		const classes = classnames(
 			'wc-block-product-categories',
@@ -81,7 +81,7 @@ class ProductCategoriesBlock extends Component {
 			}
 		);
 
-		const selectId = `prod-categories-${ ComponentId }`;
+		const selectId = `prod-categories-${ componentId }`;
 
 		return (
 			<Fragment>
diff --git a/plugins/woocommerce-blocks/assets/js/utils/with-component-id.js b/plugins/woocommerce-blocks/assets/js/utils/with-component-id.js
index 822a3f8d59c..74aa90ac78b 100644
--- a/plugins/woocommerce-blocks/assets/js/utils/with-component-id.js
+++ b/plugins/woocommerce-blocks/assets/js/utils/with-component-id.js
@@ -22,11 +22,11 @@ const withComponentId = ( OriginalComponent ) => {
 		}
 
 		render() {
-			const ComponentId = this.generateUniqueID();
+			const componentId = this.generateUniqueID();
 
 			return <OriginalComponent
 				{ ...this.props }
-				ComponentId={ ComponentId }
+				componentId={ componentId }
 			/>;
 		}
 	};