diff --git a/app/src/molecules/PipetteSelect/PipetteSelect.stories.tsx b/app/src/molecules/PipetteSelect/PipetteSelect.stories.tsx
index 4388b3c7c15..9bf2b804a6b 100644
--- a/app/src/molecules/PipetteSelect/PipetteSelect.stories.tsx
+++ b/app/src/molecules/PipetteSelect/PipetteSelect.stories.tsx
@@ -29,9 +29,9 @@ PipetteSelect.args = {
   nameBlocklist: [
     'p20_multi_gen2',
     'p300_multi_gen2',
-    'p20_single_gen3',
-    'p300_single_gen3',
-    'p1000_single_gen3',
+    'p20_single_flex',
+    'p300_single_flex',
+    'p1000_single_flex',
   ],
   enableNoneOption: true,
 }
diff --git a/app/src/molecules/WizardRequiredEquipmentList/equipmentImages.ts b/app/src/molecules/WizardRequiredEquipmentList/equipmentImages.ts
index 1e8b67172f7..4e9063c4a35 100644
--- a/app/src/molecules/WizardRequiredEquipmentList/equipmentImages.ts
+++ b/app/src/molecules/WizardRequiredEquipmentList/equipmentImages.ts
@@ -5,7 +5,7 @@ export const equipmentImages = {
   calibration_probe: require('../../assets/images/change-pip/calibration_probe.png'),
   t10_torx_screwdriver: require('../../assets/images/t10_torx_screwdriver.png'),
   hex_screwdriver: require('../../assets/images/change-pip/hex_screwdriver.png'),
-  gen3_pipette: require('../../assets/images/change-pip/single_mount_pipettes.png'),
+  flex_pipette: require('../../assets/images/change-pip/single_mount_pipettes.png'),
   pipette_96: require('../../assets/images/change-pip/ninety-six-channel.png'),
   mounting_plate_96_channel: require('../../assets/images/change-pip/mounting-plate-96-channel.png'),
   flex_gripper: require('../../assets/images/flex_gripper.svg'),
diff --git a/app/src/organisms/Devices/PipetteCard/__tests__/PipetteCard.test.tsx b/app/src/organisms/Devices/PipetteCard/__tests__/PipetteCard.test.tsx
index 136fa6af6e4..6040287c854 100644
--- a/app/src/organisms/Devices/PipetteCard/__tests__/PipetteCard.test.tsx
+++ b/app/src/organisms/Devices/PipetteCard/__tests__/PipetteCard.test.tsx
@@ -169,7 +169,7 @@ describe('PipetteCard', () => {
   it('renders banner to calibrate for ot3 pipette if not calibrated', () => {
     when(mockUseIsOT3).calledWith(mockRobotName).mockReturnValue(true)
     const { getByText } = render({
-      pipetteInfo: { ...mockLeftSpecs, name: 'p300_single_gen3' },
+      pipetteInfo: { ...mockLeftSpecs, name: 'p300_single_flex' },
       mount: LEFT,
       robotName: mockRobotName,
       is96ChannelAttached: false,
diff --git a/app/src/organisms/Devices/PipetteCard/__tests__/PipetteOverflowMenu.test.tsx b/app/src/organisms/Devices/PipetteCard/__tests__/PipetteOverflowMenu.test.tsx
index 0de50a4a584..35eb8705eee 100644
--- a/app/src/organisms/Devices/PipetteCard/__tests__/PipetteOverflowMenu.test.tsx
+++ b/app/src/organisms/Devices/PipetteCard/__tests__/PipetteOverflowMenu.test.tsx
@@ -110,7 +110,7 @@ describe('PipetteOverflowMenu', () => {
     ).toBeInTheDocument()
   })
 
-  it('renders only the about pipette button if OT-3/GEN3 pipette is attached', () => {
+  it('renders only the about pipette button if FLEX pipette is attached', () => {
     mockIsOT3Pipette.mockReturnValue(true)
 
     const { getByRole, queryByRole } = render(props)
diff --git a/app/src/organisms/InstrumentMountItem/__tests__/ProtocolInstrumentMountItem.test.tsx b/app/src/organisms/InstrumentMountItem/__tests__/ProtocolInstrumentMountItem.test.tsx
index ae994058bd1..6e28dff562c 100644
--- a/app/src/organisms/InstrumentMountItem/__tests__/ProtocolInstrumentMountItem.test.tsx
+++ b/app/src/organisms/InstrumentMountItem/__tests__/ProtocolInstrumentMountItem.test.tsx
@@ -36,7 +36,7 @@ const mockGripperData = {
   ok: true,
 }
 const mockLeftPipetteData = {
-  instrumentModel: 'p1000_multi_gen3',
+  instrumentModel: 'p1000_multi_flex',
   instrumentType: 'p1000',
   mount: 'left',
   serialNumber: 'def456',
@@ -71,7 +71,7 @@ describe('ProtocolInstrumentMountItem', () => {
       mount: LEFT,
       attachedInstrument: null,
       attachedCalibrationData: null,
-      speccedName: 'p1000_multi_gen3',
+      speccedName: 'p1000_multi_flex',
     }
     mockPipetteWizardFlows.mockReturnValue(<div>pipette wizard flow</div>)
     mockUseMaintenanceRunTakeover.mockReturnValue({
diff --git a/app/src/organisms/OnDeviceDisplay/RobotDashboard/__tests__/RecentRunProtocolCard.test.tsx b/app/src/organisms/OnDeviceDisplay/RobotDashboard/__tests__/RecentRunProtocolCard.test.tsx
index 1cf5e66c5de..fcf566e6567 100644
--- a/app/src/organisms/OnDeviceDisplay/RobotDashboard/__tests__/RecentRunProtocolCard.test.tsx
+++ b/app/src/organisms/OnDeviceDisplay/RobotDashboard/__tests__/RecentRunProtocolCard.test.tsx
@@ -33,7 +33,7 @@ const RUN_ID = 'mockRunId'
 const mockMissingPipette = [
   {
     hardwareType: 'pipette',
-    pipetteName: 'p1000_single_gen3',
+    pipetteName: 'p1000_single_flex',
     mount: 'left',
     connected: false,
   },
@@ -51,7 +51,7 @@ const mockMissingModule = [
 const missingBoth = [
   {
     hardwareType: 'pipette',
-    pipetteName: 'p1000_single_gen3',
+    pipetteName: 'p1000_single_flex',
     mount: 'left',
     connected: false,
   },
diff --git a/app/src/organisms/OnDeviceDisplay/RobotDashboard/hooks/__tests__/useMissingHardwareText.test.tsx b/app/src/organisms/OnDeviceDisplay/RobotDashboard/hooks/__tests__/useMissingHardwareText.test.tsx
index 54349903231..eb12821dbd1 100644
--- a/app/src/organisms/OnDeviceDisplay/RobotDashboard/hooks/__tests__/useMissingHardwareText.test.tsx
+++ b/app/src/organisms/OnDeviceDisplay/RobotDashboard/hooks/__tests__/useMissingHardwareText.test.tsx
@@ -80,13 +80,13 @@ describe('useMissingHardwareText', () => {
         useMissingHardwareText([
           {
             hardwareType: 'pipette',
-            pipetteName: 'p50_multi_gen3',
+            pipetteName: 'p50_multi_flex',
             mount: 'left',
             connected: false,
           },
           {
             hardwareType: 'pipette',
-            pipetteName: 'p1000_multi_gen3',
+            pipetteName: 'p1000_multi_flex',
             mount: 'right',
             connected: false,
           },
@@ -103,7 +103,7 @@ describe('useMissingHardwareText', () => {
         useMissingHardwareText([
           {
             hardwareType: 'pipette',
-            pipetteName: 'p50_multi_gen3',
+            pipetteName: 'p50_multi_flex',
             mount: 'left',
             connected: false,
           },
diff --git a/app/src/organisms/PipetteWizardFlows/__tests__/BeforeBeginning.test.tsx b/app/src/organisms/PipetteWizardFlows/__tests__/BeforeBeginning.test.tsx
index df223cec5f0..75047182753 100644
--- a/app/src/organisms/PipetteWizardFlows/__tests__/BeforeBeginning.test.tsx
+++ b/app/src/organisms/PipetteWizardFlows/__tests__/BeforeBeginning.test.tsx
@@ -89,7 +89,7 @@ describe('BeforeBeginning', () => {
             params: {
               mount: LEFT,
               pipetteId: 'abc',
-              pipetteName: 'p1000_single_gen3',
+              pipetteName: 'p1000_single_flex',
             },
           },
           { commandType: 'home' as const, params: {} },
@@ -179,7 +179,7 @@ describe('BeforeBeginning', () => {
         requiredPipette: {
           mount: LEFT,
           id: 'abc',
-          pipetteName: 'p1000_single_gen3',
+          pipetteName: 'p1000_single_flex',
         },
       }
       const { getByText, getByAltText, getByRole } = render(props)
@@ -206,7 +206,7 @@ describe('BeforeBeginning', () => {
             params: {
               mount: LEFT,
               pipetteId: 'abc',
-              pipetteName: 'p1000_single_gen3',
+              pipetteName: 'p1000_single_flex',
             },
           },
           { commandType: 'home' as const, params: {} },
@@ -247,7 +247,7 @@ describe('BeforeBeginning', () => {
             params: {
               mount: LEFT,
               pipetteId: 'abc',
-              pipetteName: 'p1000_single_gen3',
+              pipetteName: 'p1000_single_flex',
             },
           },
           { commandType: 'home' as const, params: {} },
@@ -346,7 +346,7 @@ describe('BeforeBeginning', () => {
             params: {
               mount: RIGHT,
               pipetteId: 'abc',
-              pipetteName: 'p1000_single_gen3',
+              pipetteName: 'p1000_single_flex',
             },
           },
           { commandType: 'home' as const, params: {} },
@@ -398,7 +398,7 @@ describe('BeforeBeginning', () => {
             params: {
               mount: LEFT,
               pipetteId: 'abc',
-              pipetteName: 'p1000_single_gen3',
+              pipetteName: 'p1000_single_flex',
             },
           },
           { commandType: 'home' as const, params: {} },
@@ -455,7 +455,7 @@ describe('BeforeBeginning', () => {
             params: {
               mount: LEFT,
               pipetteId: 'abc',
-              pipetteName: 'p1000_single_gen3',
+              pipetteName: 'p1000_single_flex',
             },
           },
           { commandType: 'home' as const, params: {} },
@@ -515,7 +515,7 @@ describe('BeforeBeginning', () => {
             params: {
               mount: LEFT,
               pipetteId: 'abc',
-              pipetteName: 'p1000_single_gen3',
+              pipetteName: 'p1000_single_flex',
             },
           },
           { commandType: 'home' as const, params: {} },
diff --git a/app/src/organisms/PipetteWizardFlows/__tests__/PipetteWizardFlows.test.tsx b/app/src/organisms/PipetteWizardFlows/__tests__/PipetteWizardFlows.test.tsx
index 0348808c34e..05cf6d94664 100644
--- a/app/src/organisms/PipetteWizardFlows/__tests__/PipetteWizardFlows.test.tsx
+++ b/app/src/organisms/PipetteWizardFlows/__tests__/PipetteWizardFlows.test.tsx
@@ -161,7 +161,7 @@ describe('PipetteWizardFlows', () => {
             params: {
               mount: LEFT,
               pipetteId: 'abc',
-              pipetteName: 'p1000_single_gen3',
+              pipetteName: 'p1000_single_flex',
             },
           },
           { commandType: 'home' as const, params: {} },
diff --git a/app/src/organisms/PipetteWizardFlows/__tests__/Results.test.tsx b/app/src/organisms/PipetteWizardFlows/__tests__/Results.test.tsx
index a382deb4673..8a13deb18e9 100644
--- a/app/src/organisms/PipetteWizardFlows/__tests__/Results.test.tsx
+++ b/app/src/organisms/PipetteWizardFlows/__tests__/Results.test.tsx
@@ -92,7 +92,7 @@ describe('Results', () => {
         {
           commandType: 'loadPipette' as const,
           params: {
-            pipetteName: 'p1000_single_gen3',
+            pipetteName: 'p1000_single_flex',
             pipetteId: 'abc',
             mount: 'left',
           },
@@ -124,7 +124,7 @@ describe('Results', () => {
         {
           commandType: 'loadPipette' as const,
           params: {
-            pipetteName: 'p1000_single_gen3',
+            pipetteName: 'p1000_single_flex',
             pipetteId: 'abc',
             mount: 'left',
           },
@@ -320,7 +320,7 @@ describe('Results', () => {
       flowType: FLOWS.ATTACH,
       requiredPipette: {
         id: 'mockId',
-        pipetteName: 'p1000_single_gen3',
+        pipetteName: 'p1000_single_flex',
         mount: LEFT,
       },
     }
@@ -333,7 +333,7 @@ describe('Results', () => {
       flowType: FLOWS.ATTACH,
       requiredPipette: {
         id: 'mockId',
-        pipetteName: 'p50_multi_gen3',
+        pipetteName: 'p50_multi_flex',
         mount: LEFT,
       },
     }
diff --git a/app/src/organisms/PipetteWizardFlows/__tests__/getPipetteWizardStepsForProtocol.test.tsx b/app/src/organisms/PipetteWizardFlows/__tests__/getPipetteWizardStepsForProtocol.test.tsx
index acd4706d5fd..3d1e5c09da8 100644
--- a/app/src/organisms/PipetteWizardFlows/__tests__/getPipetteWizardStepsForProtocol.test.tsx
+++ b/app/src/organisms/PipetteWizardFlows/__tests__/getPipetteWizardStepsForProtocol.test.tsx
@@ -13,10 +13,10 @@ const mockPipetteInfo = [
 ] as LoadedPipette[]
 
 const mockPipettesInProtocolNotEmpty = [
-  { id: '123', pipetteName: 'p1000_single_gen3', mount: 'left' },
+  { id: '123', pipetteName: 'p1000_single_flex', mount: 'left' },
 ]
 const mockPipettesInProtocolMulti = [
-  { id: '123', pipetteName: 'p1000_multi_gen3', mount: 'left' },
+  { id: '123', pipetteName: 'p1000_multi_flex', mount: 'left' },
 ]
 const mockSingleMountPipetteAttached = {
   left: mockAttachedPipetteInformation,
@@ -32,7 +32,7 @@ describe('getPipetteWizardStepsForProtocol', () => {
         [
           {
             id: '123',
-            pipetteName: 'p1000_single_gen3',
+            pipetteName: 'p1000_single_flex',
             mount: 'left',
           },
         ],
@@ -74,7 +74,7 @@ describe('getPipetteWizardStepsForProtocol', () => {
             data: { calibratedOffset: undefined as any },
           } as any,
         },
-        [{ id: '123', pipetteName: 'p1000_single_gen3', mount: 'right' }],
+        [{ id: '123', pipetteName: 'p1000_single_flex', mount: 'right' }],
         RIGHT
       )
     ).toStrictEqual(mockFlowSteps)
diff --git a/app/src/organisms/PipetteWizardFlows/__tests__/hooks.test.tsx b/app/src/organisms/PipetteWizardFlows/__tests__/hooks.test.tsx
index ac0f13166b5..279df671ebd 100644
--- a/app/src/organisms/PipetteWizardFlows/__tests__/hooks.test.tsx
+++ b/app/src/organisms/PipetteWizardFlows/__tests__/hooks.test.tsx
@@ -257,7 +257,7 @@ describe('usePipetteFlowWizardHeaderText', () => {
           pipetteInfo: [
             {
               id: 'id',
-              pipetteName: 'p1000_single_gen3',
+              pipetteName: 'p1000_single_flex',
               mount: LEFT,
             },
           ],
@@ -282,7 +282,7 @@ describe('usePipetteFlowWizardHeaderText', () => {
           pipetteInfo: [
             {
               id: 'id',
-              pipetteName: 'p1000_single_gen3',
+              pipetteName: 'p1000_single_flex',
               mount: LEFT,
             },
           ],
@@ -415,7 +415,7 @@ describe('usePipetteFlowWizardHeaderText', () => {
           pipetteInfo: [
             {
               id: 'id',
-              pipetteName: 'p50_single_gen3',
+              pipetteName: 'p50_single_flex',
               mount: LEFT,
             },
           ],
@@ -440,7 +440,7 @@ describe('usePipetteFlowWizardHeaderText', () => {
           pipetteInfo: [
             {
               id: 'id',
-              pipetteName: 'p50_single_gen3',
+              pipetteName: 'p50_single_flex',
               mount: LEFT,
             },
           ],
diff --git a/app/src/organisms/PipetteWizardFlows/constants.ts b/app/src/organisms/PipetteWizardFlows/constants.ts
index dbef8cbcbde..e4ddd762d95 100644
--- a/app/src/organisms/PipetteWizardFlows/constants.ts
+++ b/app/src/organisms/PipetteWizardFlows/constants.ts
@@ -38,7 +38,7 @@ export const HEX_SCREWDRIVER = {
     'Provided with the robot. Using another size can strip the instruments’s screws.',
 }
 export const PIPETTE = {
-  loadName: 'gen3_pipette',
+  loadName: 'flex_pipette',
   displayName: PIPETTE_DISPLAY_NAME,
 }
 export const NINETY_SIX_CHANNEL_PIPETTE = {
diff --git a/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/OverflowMenu.tsx b/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/OverflowMenu.tsx
index 92c2040198a..178eb22e753 100644
--- a/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/OverflowMenu.tsx
+++ b/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/OverflowMenu.tsx
@@ -82,7 +82,7 @@ export function OverflowMenu({
     showPipetteWizardFlows,
     setShowPipetteWizardFlows,
   ] = React.useState<boolean>(false)
-  const isGen3Pipette = isOT3Pipette(pipetteName as PipetteName)
+  const isFlexPipette = isOT3Pipette(pipetteName as PipetteName)
   const ot3PipCal =
     useAttachedPipettesFromInstrumentsQuery()[mount]?.data?.calibratedOffset
       ?.offset ?? null
@@ -102,7 +102,7 @@ export function OverflowMenu({
     e.preventDefault()
     if (
       !isRunning &&
-      isGen3Pipette &&
+      isFlexPipette &&
       calType === 'pipetteOffset' &&
       pipetteName != null
     ) {
@@ -199,7 +199,7 @@ export function OverflowMenu({
           right={0}
           flexDirection={DIRECTION_COLUMN}
         >
-          {isGen3Pipette ? (
+          {isFlexPipette ? (
             <MenuItem onClick={handleRecalibrate}>
               {t(
                 ot3PipCal == null
diff --git a/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/__test__/OverflowMenu.test.tsx b/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/__test__/OverflowMenu.test.tsx
index 5e68507b917..a71888119c5 100644
--- a/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/__test__/OverflowMenu.test.tsx
+++ b/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/__test__/OverflowMenu.test.tsx
@@ -184,7 +184,7 @@ describe('OverflowMenu', () => {
     expect(saveAs).toHaveBeenCalled()
   })
 
-  it('recalibration button should open up the pipette wizard flow for gen3 pipettes', () => {
+  it('recalibration button should open up the pipette wizard flow for flex pipettes', () => {
     mockUseAttachedPipettesFromInstrumentsQuery.mockReturnValue({
       left: mockAttachedPipetteInformation,
       right: null,
@@ -207,7 +207,7 @@ describe('OverflowMenu', () => {
     getByText('mock pipette wizard flows')
   })
 
-  it('calibration button should open up the pipette wizard flow for gen3 pipettes', () => {
+  it('calibration button should open up the pipette wizard flow for flex pipettes', () => {
     mockPipetteWizardFlow.mockReturnValue(<div>mock pipette wizard flows</div>)
     mockUseAllPipetteOffsetCalibrationsQuery.mockReturnValue({
       data: {
diff --git a/app/src/pages/Protocols/hooks/__tests__/hooks.test.tsx b/app/src/pages/Protocols/hooks/__tests__/hooks.test.tsx
index ce81530ef92..dbf4671917a 100644
--- a/app/src/pages/Protocols/hooks/__tests__/hooks.test.tsx
+++ b/app/src/pages/Protocols/hooks/__tests__/hooks.test.tsx
@@ -41,7 +41,7 @@ const PROTOCOL_ANALYSIS = {
   id: 'fake analysis',
   status: 'completed',
   labware: [],
-  pipettes: [{ id: 'pipId', pipetteName: 'p1000_multi_gen3', mount: 'left' }],
+  pipettes: [{ id: 'pipId', pipetteName: 'p1000_multi_flex', mount: 'left' }],
   modules: [
     {
       id: 'modId',
@@ -152,7 +152,7 @@ describe('useMissingProtocolHardware', () => {
     expect(result.current).toEqual([
       {
         hardwareType: 'pipette',
-        pipetteName: 'p1000_multi_gen3',
+        pipetteName: 'p1000_multi_flex',
         mount: 'left',
         connected: false,
       },
@@ -167,7 +167,7 @@ describe('useMissingProtocolHardware', () => {
   it('should return empty array when the correct modules and pipettes are attached', () => {
     mockUseAttachedPipettes.mockReturnValue({
       left: {
-        name: 'p1000_multi_gen3',
+        name: 'p1000_multi_flex',
       },
       right: {},
     } as any)
diff --git a/app/src/redux/pipettes/__fixtures__/index.ts b/app/src/redux/pipettes/__fixtures__/index.ts
index 8f0828d43c2..7011837c4b3 100644
--- a/app/src/redux/pipettes/__fixtures__/index.ts
+++ b/app/src/redux/pipettes/__fixtures__/index.ts
@@ -43,25 +43,25 @@ export const mockUnattachedPipette = {
   plunger_axis: 'b',
 }
 
-export const mockAttachedGen3Pipette: Omit<AttachedPipette, 'modelSpecs'> = {
+export const mockAttachedFlexPipette: Omit<AttachedPipette, 'modelSpecs'> = {
   id: 'abc',
-  name: 'p1000_single_gen3',
+  name: 'p1000_single_flex',
   model: 'p1000_single_v3.0',
   tip_length: 42,
   mount_axis: 'c',
   plunger_axis: 'd',
 }
 
-export const mockGen3P1000PipetteSpecs: any = {
+export const mockFlexP1000PipetteSpecs: any = {
   displayName: 'Flex 1-Channel 1000 μL',
-  name: 'p1000_single_gen3',
+  name: 'p1000_single_flex',
   backCompatNames: ['p1000_single'],
   channels: 1,
 }
 
-export const mockGen3P1000Pipette8ChannelSpecs: any = {
+export const mockFlexP1000Pipette8ChannelSpecs: any = {
   displayName: 'Flex 8-Channel 1000 μL',
-  name: 'p1000_multi_gen3',
+  name: 'p1000_multi_flex',
   channels: 8,
   backCompatNames: ['p1000_multi'],
 }
@@ -345,7 +345,7 @@ export const mockPipetteData1Channel: PipetteData = {
     },
   },
   instrumentModel: 'p1000_single_v3.0',
-  instrumentName: 'p1000_single_gen3',
+  instrumentName: 'p1000_single_flex',
   instrumentType: 'pipette',
   mount: 'left',
   serialNumber: 'abc',
@@ -369,7 +369,7 @@ export const mockPipetteData8Channel: PipetteData = {
     },
   },
   instrumentModel: 'p1000_multi_v3.0',
-  instrumentName: 'p1000_multi_gen3',
+  instrumentName: 'p1000_multi_flex',
   instrumentType: 'pipette',
   mount: 'right',
   serialNumber: 'cba',
diff --git a/components/src/__tests__/__snapshots__/instrument-diagram.test.tsx.snap b/components/src/__tests__/__snapshots__/instrument-diagram.test.tsx.snap
index 600db0d18ba..d0093db3092 100644
--- a/components/src/__tests__/__snapshots__/instrument-diagram.test.tsx.snap
+++ b/components/src/__tests__/__snapshots__/instrument-diagram.test.tsx.snap
@@ -85,7 +85,7 @@ exports[`InstrumentDiagram Single-channel renders correctly 1`] = `
 </div>
 `;
 
-exports[`InstrumentDiagram eight-channel GEN3 renders correctly 1`] = `
+exports[`InstrumentDiagram eight-channel FLEX renders correctly 1`] = `
 .c0 {
   min-width: 0;
   -webkit-transform: scaleX(-1);
@@ -100,12 +100,12 @@ exports[`InstrumentDiagram eight-channel GEN3 renders correctly 1`] = `
 >
   <img
     className=""
-    src="eight-channel-gen3.png"
+    src="eight-channel-flex.png"
   />
 </div>
 `;
 
-exports[`InstrumentDiagram single-channel GEN3 renders correctly 1`] = `
+exports[`InstrumentDiagram single-channel FLEX renders correctly 1`] = `
 .c0 {
   min-width: 0;
   -webkit-transform: scaleX(-1);
@@ -120,7 +120,7 @@ exports[`InstrumentDiagram single-channel GEN3 renders correctly 1`] = `
 >
   <img
     className=""
-    src="single-channel-gen3.png"
+    src="single-channel-flex.png"
   />
 </div>
 `;
diff --git a/components/src/__tests__/instrument-diagram.test.tsx b/components/src/__tests__/instrument-diagram.test.tsx
index 52aa953f7a9..104d450bdbf 100644
--- a/components/src/__tests__/instrument-diagram.test.tsx
+++ b/components/src/__tests__/instrument-diagram.test.tsx
@@ -50,7 +50,7 @@ describe('InstrumentDiagram', () => {
     expect(tree).toMatchSnapshot()
   })
 
-  it('single-channel GEN3 renders correctly', () => {
+  it('single-channel FLEX renders correctly', () => {
     const tree = Renderer.create(
       <InstrumentDiagram
         mount="right"
@@ -61,7 +61,7 @@ describe('InstrumentDiagram', () => {
     expect(tree).toMatchSnapshot()
   })
 
-  it('eight-channel GEN3 renders correctly', () => {
+  it('eight-channel FLEX renders correctly', () => {
     const tree = Renderer.create(
       <InstrumentDiagram
         mount="right"
diff --git a/components/src/instrument/InstrumentDiagram.tsx b/components/src/instrument/InstrumentDiagram.tsx
index 647c430872b..b0b682c57fd 100644
--- a/components/src/instrument/InstrumentDiagram.tsx
+++ b/components/src/instrument/InstrumentDiagram.tsx
@@ -5,8 +5,8 @@ import singleSrc from '@opentrons/components/src/instrument/single_channel_GEN1_
 import multiSrc from '@opentrons/components/src/instrument/multi-channel_GEN1_800px.png'
 import singleGEN2Src from '@opentrons/components/src/instrument/single-channel_GEN2_800px.png'
 import multiGEN2Src from '@opentrons/components/src/instrument/multi-channel_GEN2_800px.png'
-import singleFlexSrc from '@opentrons/components/src/instrument/single-channel-gen3.png'
-import eightChannelFlexSrc from '@opentrons/components/src/instrument/eight-channel-gen3.png'
+import singleFlexSrc from '@opentrons/components/src/instrument/single-channel-flex.png'
+import eightChannelFlexSrc from '@opentrons/components/src/instrument/eight-channel-flex.png'
 import ninetySixSrc from '@opentrons/components/src/instrument/ninety-six-channel-gen1.png'
 
 import type { PipetteNameSpecs } from '@opentrons/shared-data'
diff --git a/components/src/instrument/PipetteSelect.stories.tsx b/components/src/instrument/PipetteSelect.stories.tsx
index 1d535569e64..c6dcf050663 100644
--- a/components/src/instrument/PipetteSelect.stories.tsx
+++ b/components/src/instrument/PipetteSelect.stories.tsx
@@ -29,11 +29,11 @@ PipetteSelect.args = {
   nameBlocklist: [
     'p20_multi_gen2',
     'p300_multi_gen2',
-    'p20_single_gen3',
-    'p300_single_gen3',
-    'p1000_single_gen3',
-    'p1000_multi_gen3',
-    'p50_multi_gen3',
+    'p20_single_flex',
+    'p300_single_flex',
+    'p1000_single_flex',
+    'p1000_multi_flex',
+    'p50_multi_flex',
   ],
   enableNoneOption: true,
 }
diff --git a/components/src/instrument/PipetteSelect.tsx b/components/src/instrument/PipetteSelect.tsx
index 0918a5c2d68..9e765561c15 100644
--- a/components/src/instrument/PipetteSelect.tsx
+++ b/components/src/instrument/PipetteSelect.tsx
@@ -5,7 +5,7 @@ import {
   getPipetteNameSpecs,
   GEN1,
   GEN2,
-  FLEX
+  FLEX,
 } from '@opentrons/shared-data'
 import { Flex } from '../primitives'
 import { Select, CONTEXT_VALUE } from '../forms'
@@ -67,14 +67,12 @@ export const PipetteSelect = (props: PipetteSelectProps): JSX.Element => {
   const allowlist = ({ value }: SelectOption): boolean => {
     return !nameBlocklist.some(n => n === value)
   }
-  const gen3Options = specsByCategory[FLEX]
-    .map(specToOption)
-    .filter(allowlist)
+  const flexOptions = specsByCategory[FLEX].map(specToOption).filter(allowlist)
   const gen2Options = specsByCategory[GEN2].map(specToOption).filter(allowlist)
   const gen1Options = specsByCategory[GEN1].map(specToOption).filter(allowlist)
   const groupedOptions = [
     ...(enableNoneOption ? [OPTION_NONE] : []),
-    ...(gen3Options.length > 0 ? [{ options: gen3Options }] : []),
+    ...(flexOptions.length > 0 ? [{ options: flexOptions }] : []),
     ...(gen2Options.length > 0 ? [{ options: gen2Options }] : []),
     ...(gen1Options.length > 0 ? [{ options: gen1Options }] : []),
   ]
diff --git a/components/src/instrument/__tests__/PipetteSelect.test.tsx b/components/src/instrument/__tests__/PipetteSelect.test.tsx
index e40559369d4..90a94192261 100644
--- a/components/src/instrument/__tests__/PipetteSelect.test.tsx
+++ b/components/src/instrument/__tests__/PipetteSelect.test.tsx
@@ -50,13 +50,13 @@ describe('PipetteSelect', () => {
       .map(getPipetteNameSpecs)
       .filter((specs): specs is PipetteNameSpecs => specs !== null)
 
-    const gen3Specs = pipetteSpecs.filter(s => s.displayCategory === FLEX)
+    const flexSpecs = pipetteSpecs.filter(s => s.displayCategory === FLEX)
     const gen2Specs = pipetteSpecs.filter(s => s.displayCategory === GEN2)
     const gen1Specs = pipetteSpecs.filter(s => s.displayCategory === GEN1)
 
     expect(wrapper.find(Select).prop('options')).toEqual([
       {
-        options: gen3Specs.map(s => ({ value: s.name, label: s.displayName })),
+        options: flexSpecs.map(s => ({ value: s.name, label: s.displayName })),
       },
       {
         options: gen2Specs.map(s => ({ value: s.name, label: s.displayName })),
@@ -94,7 +94,7 @@ describe('PipetteSelect', () => {
     ])
   })
 
-  it('excludes the gen3 pipette options', () => {
+  it('excludes the flex pipette options', () => {
     const pipetteSpecs: PipetteNameSpecs[] = getAllPipetteNames(
       'maxVolume',
       'channels'
diff --git a/components/src/instrument/eight-channel-gen3.png b/components/src/instrument/eight-channel-flex.png
similarity index 100%
rename from components/src/instrument/eight-channel-gen3.png
rename to components/src/instrument/eight-channel-flex.png
diff --git a/components/src/instrument/single-channel-gen3.png b/components/src/instrument/single-channel-flex.png
similarity index 100%
rename from components/src/instrument/single-channel-gen3.png
rename to components/src/instrument/single-channel-flex.png
diff --git a/shared-data/js/pipettes.ts b/shared-data/js/pipettes.ts
index c237bd26c47..938bb123efa 100644
--- a/shared-data/js/pipettes.ts
+++ b/shared-data/js/pipettes.ts
@@ -69,7 +69,7 @@ export function shouldLevel(specs: PipetteNameSpecs): boolean {
 export function isOT3Pipette(pipetteName: PipetteName): boolean {
   return (
     OT3_PIPETTES.includes(pipetteName) ||
-    getPipetteNameSpecs(pipetteName)?.displayCategory === 'GEN3'
+    getPipetteNameSpecs(pipetteName)?.displayCategory === 'FLEX'
   )
 }
 
diff --git a/shared-data/pipette/schemas/1/pipetteNameSpecsSchema.json b/shared-data/pipette/schemas/1/pipetteNameSpecsSchema.json
index 2228fba617a..73a6aa96351 100644
--- a/shared-data/pipette/schemas/1/pipetteNameSpecsSchema.json
+++ b/shared-data/pipette/schemas/1/pipetteNameSpecsSchema.json
@@ -11,7 +11,7 @@
     },
     "displayCategory": {
       "type": "string",
-      "enum": ["GEN1", "GEN2", "GEN3"]
+      "enum": ["GEN1", "GEN2", "FLEX"]
     },
     "valuesByApiLevel": {
       "type": "object",