diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
index be9ae17286..ab55370e84 100644
--- a/packages/app/src/App.tsx
+++ b/packages/app/src/App.tsx
@@ -105,10 +105,7 @@ import { ApacheAirflowPage } from '@backstage/plugin-apache-airflow';
 import { RequirePermission } from '@backstage/plugin-permission-react';
 import { catalogEntityCreatePermission } from '@backstage/plugin-catalog-common';
 import { PlaylistIndexPage } from '@backstage/plugin-playlist';
-import {
-  AnotherCustomlayout,
-  CustomLayout,
-} from './components/scaffolder/customScaffolderLayouts';
+import { TwoColumnLayout } from './components/scaffolder/customScaffolderLayouts';
 
 const app = createApp({
   apis,
@@ -225,7 +222,7 @@ const routes = (
           <LowerCaseValuePickerFieldExtension />
         </ScaffolderFieldExtensions>
         <ScaffolderLayouts>
-          <CustomLayout />
+          <TwoColumnLayout />
         </ScaffolderLayouts>
       </>
     </Route>
diff --git a/packages/app/src/components/scaffolder/customScaffolderLayouts.tsx b/packages/app/src/components/scaffolder/customScaffolderLayouts.tsx
index a9def3926e..f11cf7d3be 100644
--- a/packages/app/src/components/scaffolder/customScaffolderLayouts.tsx
+++ b/packages/app/src/components/scaffolder/customScaffolderLayouts.tsx
@@ -21,11 +21,7 @@ import {
 } from '@backstage/plugin-scaffolder';
 import { Grid } from '@material-ui/core';
 
-const TwoColumLayout: ObjectFieldTemplate = ({
-  properties,
-  description,
-  title,
-}) => {
+const TwoColum: ObjectFieldTemplate = ({ properties, description, title }) => {
   const mid = Math.ceil(properties.length / 2);
   const left = properties.slice(0, mid);
   const right = properties.slice(mid);
@@ -50,9 +46,9 @@ const TwoColumLayout: ObjectFieldTemplate = ({
   );
 };
 
-export const CustomLayout = scaffolderPlugin.provide(
+export const TwoColumnLayout = scaffolderPlugin.provide(
   createScaffolderLayout({
-    name: 'CustomLayout',
-    component: TwoColumLayout,
+    name: 'TwoColumn',
+    component: TwoColum,
   }),
 );
diff --git a/packages/app/src/components/scaffolder/defaultPreviewTemplate.ts b/packages/app/src/components/scaffolder/defaultPreviewTemplate.ts
index 2abed330c4..7ab1556fc7 100644
--- a/packages/app/src/components/scaffolder/defaultPreviewTemplate.ts
+++ b/packages/app/src/components/scaffolder/defaultPreviewTemplate.ts
@@ -17,7 +17,7 @@
 export const defaultPreviewTemplate = `# Edit the template parameters below to see how they will render in the scaffolder form UI
 parameters:
   - title: Fill in some steps
-    ui:layout: 'CustomLayout'
+    ui:layout: 'TwoColumn'
     required:
       - name
     properties: