Enhancement/12070 adspax followup

assets/js/modules/ads/components/setup/SetupFormPAX.js → assets/js/modules/ads/components/setup/SetupForm.js

@@ -1,5 +1,5 @@
 /**
- * Ads PAX Setup form.
+ * Ads Setup form.
  *
  * Site Kit by Google, Copyright 2025 Google LLC
  *
@@ -38,10 +38,7 @@ import { ConversionIDTextField } from '@/js/modules/ads/components/common';
 import { CORE_SITE } from '@/js/googlesitekit/datastore/site/constants';
 import Notice from '@/js/components/Notice';
 
-export default function SetupFormPAX( {
-	finishSetup,
-	isNavigatingToOAuthURL,
-} ) {
+export default function SetupForm( { finishSetup, isNavigatingToOAuthURL } ) {
 	const canSubmitChanges = useSelect( ( select ) =>
 		select( MODULES_ADS ).canSubmitChanges()
 	);
@@ -124,7 +121,7 @@ export default function SetupFormPAX( {
 	);
 }
 
-SetupFormPAX.propTypes = {
+SetupForm.propTypes = {
 	finishSetup: PropTypes.func,
 	isNavigatingToOAuthURL: PropTypes.bool,
 };

assets/js/modules/ads/components/setup/SetupMainPAX.js → assets/js/modules/ads/components/setup/SetupMain.js

@@ -1,5 +1,5 @@
 /**
- * Ads Main PAX setup component.
+ * Ads Main setup component.
  *
  * Site Kit by Google, Copyright 2024 Google LLC
  *
@@ -41,7 +41,7 @@ import { addQueryArgs } from '@wordpress/url';
 import { useSelect, useDispatch, useRegistry } from 'googlesitekit-data';
 import { SpinnerButton } from 'googlesitekit-components';
 import AdsIcon from '@/svg/graphics/ads.svg';
-import SetupFormPAX from './SetupFormPAX';
+import SetupForm from './SetupForm';
 import AdBlockerWarning from '@/js/components/notifications/AdBlockerWarning';
 import { CORE_USER } from '@/js/googlesitekit/datastore/user/constants';
 import { CORE_LOCATION } from '@/js/googlesitekit/datastore/location/constants';
@@ -65,7 +65,7 @@ import useViewContext from '@/js/hooks/useViewContext';
 import { trackEvent } from '@/js/util';
 import Typography from '@/js/components/Typography';
 
-export default function SetupMainPAX( { finishSetup } ) {
+export default function SetupMain( { finishSetup } ) {
 	const [ openDialog, setOpenDialog ] = useState( false );
 	const [ showPaxAppQueryParam, setShowPaxAppQueryParam ] =
 		useQueryArg( PAX_PARAM_SETUP_STEP );
@@ -393,7 +393,7 @@ export default function SetupMainPAX( { finishSetup } ) {
 										}
 									) }
 								</p>
-								<SetupFormPAX
+								<SetupForm
 									finishSetup={ finishSetup }
 									isNavigatingToOAuthURL={
 										isNavigatingToOAuthURL
@@ -418,6 +418,6 @@ export default function SetupMainPAX( { finishSetup } ) {
 	);
 }
 
-SetupMainPAX.defaultProps = {
+SetupMain.defaultProps = {
 	finishSetup: () => {},
 };

assets/js/modules/ads/components/setup/SetupMainPAX.stories.js → assets/js/modules/ads/components/setup/SetupMain.stories.js

@@ -1,5 +1,5 @@
 /**
- * SetupMainPAX component stories.
+ * SetupMain component stories.
  *
  * Site Kit by Google, Copyright 2024 Google LLC
  *
@@ -29,7 +29,7 @@ import {
 	provideSiteInfo,
 	provideUserAuthentication,
 } from '../../../../../../tests/js/utils';
-import SetupMainPAX from './SetupMainPAX';
+import SetupMain from './SetupMain';
 import WithRegistrySetup from '../../../../../../tests/js/WithRegistrySetup';
 import { Cell, Grid, Row } from '@/js/material-components';
 
@@ -40,7 +40,7 @@ function Template() {
 				<Grid>
 					<Row>
 						<Cell size={ 12 }>
-							<SetupMainPAX />
+							<SetupMain />
 						</Cell>
 					</Row>
 				</Grid>
@@ -103,7 +103,7 @@ WithGoogleForWooCommerceConflict.args = {
 WithGoogleForWooCommerceConflict.scenario = {};
 
 export default {
-	title: 'Modules/Ads/Setup/SetupMainPAX',
+	title: 'Modules/Ads/Setup/SetupMain',
 	decorators: [
 		( Story, { args } ) => {
 			function setupRegistry( registry ) {

assets/js/modules/ads/components/setup/index.js

@@ -16,5 +16,5 @@
  * limitations under the License.
  */
 
-export { default as SetupFormPAX } from './SetupFormPAX';
-export { default as SetupMainPAX } from './SetupMainPAX';
+export { default as SetupForm } from './SetupForm';
+export { default as SetupMain } from './SetupMain';

assets/js/modules/ads/index.js

@@ -27,7 +27,7 @@ import { getQueryArg } from '@wordpress/url';
  */
 import AdsIcon from '@/svg/graphics/ads.svg';
 import { SettingsEdit, SettingsView } from './components/settings';
-import { SetupMainPAX } from './components/setup';
+import { SetupMain } from './components/setup';
 import { MODULES_ADS } from './datastore/constants';
 import { MODULE_SLUG_ADS } from './constants';
 import { CORE_MODULES } from '@/js/googlesitekit/modules/datastore/constants';
@@ -63,7 +63,7 @@ export function registerModule( modules ) {
 		storeName: MODULES_ADS,
 		SettingsEditComponent: SettingsEdit,
 		SettingsViewComponent: SettingsView,
-		SetupComponent: SetupMainPAX,
+		SetupComponent: SetupMain,
 		Icon: AdsIcon,
 		features: [
 			__(