diff --git a/app/src/assets/localization/en/protocol_command_text.json b/app/src/assets/localization/en/protocol_command_text.json
index 5640f3306a5..6dbee9af16f 100644
--- a/app/src/assets/localization/en/protocol_command_text.json
+++ b/app/src/assets/localization/en/protocol_command_text.json
@@ -1,7 +1,7 @@
 {
-  "absorbance_reader_open_lid": "Opening Absorbance Reader lid",
   "absorbance_reader_close_lid": "Closing Absorbance Reader lid",
   "absorbance_reader_initialize": "Initializing Absorbance Reader to perform {{mode}} measurement at {{wavelengths}}",
+  "absorbance_reader_open_lid": "Opening Absorbance Reader lid",
   "absorbance_reader_read": "Reading plate in Absorbance Reader",
   "adapter_in_mod_in_slot": "{{adapter}} on {{module}} in {{slot}}",
   "adapter_in_slot": "{{adapter}} in {{slot}}",
@@ -27,6 +27,7 @@
   "dispense_push_out": "Dispensing {{volume}} µL into well {{well_name}} of {{labware}} in {{labware_location}} at {{flow_rate}} µL/sec and pushing out {{push_out_volume}} µL",
   "drop_tip": "Dropping tip in {{well_name}} of {{labware}}",
   "drop_tip_in_place": "Dropping tip in place",
+  "dropping_tip_in_trash": "Dropping tip in {{trash}}",
   "engaging_magnetic_module": "Engaging Magnetic Module",
   "fixed_trash": "Fixed Trash",
   "home_gantry": "Homing all gantry, pipette, and plunger axes",
@@ -73,16 +74,16 @@
   "setting_thermocycler_lid_temp": "Setting Thermocycler lid temperature to {{temp}}",
   "single": "single",
   "slot": "Slot {{slot_name}}",
-  "turning_rail_lights_off": "Turning rail lights off",
-  "turning_rail_lights_on": "Turning rail lights on",
   "target_temperature": "target temperature",
   "tc_awaiting_for_duration": "Waiting for Thermocycler profile to complete",
   "tc_run_profile_steps": "Temperature: {{celsius}}°C, hold time: {{duration}}",
-  "tc_starting_extended_profile_cycle": "{{repetitions}} repetitions of the following steps:",
   "tc_starting_extended_profile": "Running thermocycler profile with {{elementCount}} total steps and cycles:",
+  "tc_starting_extended_profile_cycle": "{{repetitions}} repetitions of the following steps:",
   "tc_starting_profile": "Running thermocycler profile with {{stepCount}} steps:",
   "touch_tip": "Touching tip",
   "trash_bin_in_slot": "Trash Bin in {{slot_name}}",
+  "turning_rail_lights_off": "Turning rail lights off",
+  "turning_rail_lights_on": "Turning rail lights on",
   "unlatching_hs_latch": "Unlatching labware on Heater-Shaker",
   "wait_for_duration": "Pausing for {{seconds}} seconds. {{message}}",
   "wait_for_resume": "Pausing protocol",
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/index.tsx b/app/src/local-resources/commands/hooks/useCommandTextString/index.ts
similarity index 98%
rename from app/src/local-resources/commands/hooks/useCommandTextString/index.tsx
rename to app/src/local-resources/commands/hooks/useCommandTextString/index.ts
index 3966a1bc7f4..0eb04ee588e 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/index.tsx
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/index.ts
@@ -7,11 +7,11 @@ import type {
   RobotType,
   LabwareDefinition2,
 } from '@opentrons/shared-data'
-import type { GetDirectTranslationCommandText } from './utils/getDirectTranslationCommandText'
 import type {
   TCProfileStepText,
   TCProfileCycleText,
-} from './utils/getTCRunExtendedProfileCommandText'
+  GetDirectTranslationCommandText,
+} from './utils'
 import type { CommandTextData } from '/app/local-resources/commands/types'
 
 export interface UseCommandTextStringParams {
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/__tests__/getPipettingCommandText.test.tsx b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/__tests__/getPipettingCommandText.test.tsx
new file mode 100644
index 00000000000..82b269bd581
--- /dev/null
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/__tests__/getPipettingCommandText.test.tsx
@@ -0,0 +1,186 @@
+import { screen } from '@testing-library/react'
+import { vi, describe, it, beforeEach } from 'vitest'
+import { useTranslation } from 'react-i18next'
+
+import { renderWithProviders } from '/app/__testing-utils__'
+import { i18n } from '/app/i18n'
+import {
+  getLabwareDefinitionsFromCommands,
+  getLabwareName,
+  getLoadedLabware,
+  getLabwareDisplayLocation,
+} from '/app/local-resources/labware'
+import { getPipettingCommandText } from '../getPipettingCommandText'
+import { getLabwareDefURI } from '@opentrons/shared-data'
+import { getFinalLabwareLocation } from '../../getFinalLabwareLocation'
+import { getWellRange } from '../../getWellRange'
+import { getFinalMoveToAddressableAreaCmd } from '../../getFinalAddressableAreaCmd'
+import { getAddressableAreaDisplayName } from '../../getAddressableAreaDisplayName'
+
+vi.mock('@opentrons/shared-data')
+vi.mock('../../getFinalLabwareLocation')
+vi.mock('../../getWellRange')
+vi.mock('/app/local-resources/labware')
+vi.mock('../../getFinalAddressableAreaCmd')
+vi.mock('../../getAddressableAreaDisplayName')
+
+const baseCommandData = {
+  allRunDefs: {},
+  robotType: 'OT-2',
+  commandTextData: {
+    commands: [],
+    labware: [],
+    modules: [],
+    pipettes: [{ id: 'pipette-1', pipetteName: 'p300_single' }],
+  },
+} as any
+
+function TestWrapper({ command }: { command: any }): JSX.Element {
+  const { t } = useTranslation('protocol_command_text')
+  const text = getPipettingCommandText({
+    command,
+    ...baseCommandData,
+    t,
+  })
+
+  return <div>{text}</div>
+}
+
+const render = (command: any) => {
+  return renderWithProviders(<TestWrapper command={command} />, {
+    i18nInstance: i18n,
+  })
+}
+
+describe('getPipettingCommandText', () => {
+  beforeEach(() => {
+    vi.mocked(getLabwareDefURI).mockImplementation((def: any) => def.uri)
+    vi.mocked(getFinalLabwareLocation).mockReturnValue('slot-1' as any)
+    vi.mocked(getWellRange).mockReturnValue('A1')
+    vi.mocked(getLabwareDefinitionsFromCommands).mockReturnValue([
+      { uri: 'tiprack-uri', parameters: { isTiprack: true } },
+      { uri: 'plate-uri', parameters: { isTiprack: false } },
+    ] as any)
+    vi.mocked(getLabwareName).mockReturnValue('Test Labware')
+    vi.mocked(getLoadedLabware).mockImplementation(
+      (labware, id) =>
+        ({
+          definitionUri: id === 'tiprack-id' ? 'tiprack-uri' : 'plate-uri',
+        } as any)
+    )
+    vi.mocked(getLabwareDisplayLocation).mockReturnValue('Slot 1')
+    vi.mocked(getFinalMoveToAddressableAreaCmd).mockReturnValue({
+      id: 'cmd-1',
+      commandType: 'moveToAddressableArea',
+    } as any)
+    vi.mocked(getAddressableAreaDisplayName).mockReturnValue('Fixed Trash')
+  })
+
+  it('should render aspirate command text correctly', () => {
+    const command = {
+      id: 'cmd-1',
+      commandType: 'aspirate',
+      params: {
+        labwareId: 'labware-1',
+        wellName: 'A1',
+        volume: 100,
+        flowRate: 150,
+      },
+    }
+
+    render(command)
+    screen.getByText(
+      /Aspirating 100 µL from well A1 of Test Labware in Slot 1 at 150 µL\/sec/
+    )
+  })
+
+  it('should render dispense command text correctly', () => {
+    const command = {
+      id: 'cmd-1',
+      commandType: 'dispense',
+      params: {
+        labwareId: 'labware-1',
+        wellName: 'A1',
+        volume: 100,
+        flowRate: 150,
+      },
+    }
+
+    render(command)
+    screen.getByText(
+      /Dispensing 100 µL into well A1 of Test Labware in Slot 1 at 150 µL\/sec/
+    )
+  })
+
+  it('should render dispense with push out command text correctly', () => {
+    const command = {
+      id: 'cmd-1',
+      commandType: 'dispense',
+      params: {
+        labwareId: 'labware-1',
+        wellName: 'A1',
+        volume: 100,
+        flowRate: 150,
+        pushOut: 10,
+      },
+    }
+
+    render(command)
+    screen.getByText(
+      /Dispensing 100 µL into well A1 of Test Labware in Slot 1 at 150 µL\/sec and pushing out 10 µL/
+    )
+  })
+
+  it('should render pickup tip command text correctly', () => {
+    const command = {
+      id: 'cmd-1',
+      commandType: 'pickUpTip',
+      params: {
+        labwareId: 'tiprack-id',
+        wellName: 'A1',
+        pipetteId: 'pipette-1',
+      },
+    }
+
+    render(command)
+    screen.getByText(/Picking up tip\(s\) from A1 of Test Labware in Slot 1/)
+  })
+
+  it('should render drop tip in tiprack command text correctly', () => {
+    const command = {
+      id: 'cmd-1',
+      commandType: 'dropTip',
+      params: {
+        labwareId: 'tiprack-id',
+        wellName: 'A1',
+      },
+    }
+
+    render(command)
+    screen.getByText(/Returning tip to A1 of Test Labware in Slot 1/)
+  })
+
+  it('should render drop tip in place command text correctly if there is an addressable area name', () => {
+    const command = {
+      id: 'cmd-1',
+      commandType: 'dropTipInPlace',
+      params: {},
+    }
+
+    render(command)
+    screen.getByText('Dropping tip in Fixed Trash')
+  })
+
+  it('should render drop tip in place command text correctly if there is not an addressable area name', () => {
+    const command = {
+      id: 'cmd-1',
+      commandType: 'dropTipInPlace',
+      params: {},
+    }
+
+    vi.mocked(getFinalMoveToAddressableAreaCmd).mockReturnValue(null)
+
+    render(command)
+    screen.getByText('Dropping tip in place')
+  })
+})
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getAbsorbanceReaderCommandText.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getAbsorbanceReaderCommandText.ts
similarity index 97%
rename from app/src/local-resources/commands/hooks/useCommandTextString/utils/getAbsorbanceReaderCommandText.ts
rename to app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getAbsorbanceReaderCommandText.ts
index b9e7107b569..926ed749609 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getAbsorbanceReaderCommandText.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getAbsorbanceReaderCommandText.ts
@@ -5,7 +5,7 @@ import type {
   AbsorbanceReaderReadRunTimeCommand,
   RunTimeCommand,
 } from '@opentrons/shared-data'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export type AbsorbanceCreateCommand =
   | AbsorbanceReaderOpenLidRunTimeCommand
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getCommentCommandText.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getCommentCommandText.ts
similarity index 83%
rename from app/src/local-resources/commands/hooks/useCommandTextString/utils/getCommentCommandText.ts
rename to app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getCommentCommandText.ts
index 3a1b7ce7e8a..f50de82c96e 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getCommentCommandText.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getCommentCommandText.ts
@@ -1,5 +1,5 @@
 import type { CommentRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getCommentCommandText({
   command,
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getConfigureForVolumeCommandText.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getConfigureForVolumeCommandText.ts
similarity index 92%
rename from app/src/local-resources/commands/hooks/useCommandTextString/utils/getConfigureForVolumeCommandText.ts
rename to app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getConfigureForVolumeCommandText.ts
index 1a4ee2e7c0e..fd9456b4cc3 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getConfigureForVolumeCommandText.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getConfigureForVolumeCommandText.ts
@@ -1,7 +1,7 @@
 import { getPipetteSpecsV2 } from '@opentrons/shared-data'
 
 import type { ConfigureForVolumeRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getConfigureForVolumeCommandText({
   command,
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getConfigureNozzleLayoutCommandText.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getConfigureNozzleLayoutCommandText.ts
similarity index 95%
rename from app/src/local-resources/commands/hooks/useCommandTextString/utils/getConfigureNozzleLayoutCommandText.ts
rename to app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getConfigureNozzleLayoutCommandText.ts
index 04d476fadd1..8c9e12f3d5b 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getConfigureNozzleLayoutCommandText.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getConfigureNozzleLayoutCommandText.ts
@@ -1,7 +1,7 @@
 import { getPipetteSpecsV2 } from '@opentrons/shared-data'
 
 import type { ConfigureNozzleLayoutRunTimeCommand } from '@opentrons/shared-data'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getConfigureNozzleLayoutCommandText({
   command,
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getCustomCommandText.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getCustomCommandText.ts
similarity index 91%
rename from app/src/local-resources/commands/hooks/useCommandTextString/utils/getCustomCommandText.ts
rename to app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getCustomCommandText.ts
index da6d5a1d506..97d60249f7e 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getCustomCommandText.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getCustomCommandText.ts
@@ -1,5 +1,5 @@
 import type { CustomRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getCustomCommandText({
   command,
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getDelayCommandText.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getDelayCommandText.ts
similarity index 91%
rename from app/src/local-resources/commands/hooks/useCommandTextString/utils/getDelayCommandText.ts
rename to app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getDelayCommandText.ts
index 8bb24d99661..f421a163b36 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getDelayCommandText.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getDelayCommandText.ts
@@ -1,5 +1,5 @@
 import type { DeprecatedDelayRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getDelayCommandText({
   command,
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getDirectTranslationCommandText.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getDirectTranslationCommandText.ts
similarity index 97%
rename from app/src/local-resources/commands/hooks/useCommandTextString/utils/getDirectTranslationCommandText.ts
rename to app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getDirectTranslationCommandText.ts
index fd586136e90..92e969f402b 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getDirectTranslationCommandText.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getDirectTranslationCommandText.ts
@@ -1,5 +1,5 @@
 import type { RunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 const SIMPLE_TRANSLATION_KEY_BY_COMMAND_TYPE: {
   [commandType in RunTimeCommand['commandType']]?: string
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getHSShakeSpeedCommandText.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getHSShakeSpeedCommandText.ts
similarity index 87%
rename from app/src/local-resources/commands/hooks/useCommandTextString/utils/getHSShakeSpeedCommandText.ts
rename to app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getHSShakeSpeedCommandText.ts
index 3710e7f0930..157cde89212 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getHSShakeSpeedCommandText.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getHSShakeSpeedCommandText.ts
@@ -1,5 +1,5 @@
 import type { HeaterShakerSetAndWaitForShakeSpeedRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getHSShakeSpeedCommandText({
   command,
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getLiquidProbeCommandText.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getLiquidProbeCommandText.ts
similarity index 92%
rename from app/src/local-resources/commands/hooks/useCommandTextString/utils/getLiquidProbeCommandText.ts
rename to app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getLiquidProbeCommandText.ts
index 171667012fe..014d30318eb 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getLiquidProbeCommandText.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getLiquidProbeCommandText.ts
@@ -2,14 +2,14 @@ import {
   getLabwareName,
   getLabwareDisplayLocation,
 } from '/app/local-resources/labware'
-import { getFinalLabwareLocation } from './getFinalLabwareLocation'
+import { getFinalLabwareLocation } from '../getFinalLabwareLocation'
 
 import type {
   LiquidProbeRunTimeCommand,
   RunTimeCommand,
   TryLiquidProbeRunTimeCommand,
 } from '@opentrons/shared-data'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 type LiquidProbeRunTimeCommands =
   | LiquidProbeRunTimeCommand
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getLoadCommandText.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getLoadCommandText.ts
similarity index 97%
rename from app/src/local-resources/commands/hooks/useCommandTextString/utils/getLoadCommandText.ts
rename to app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getLoadCommandText.ts
index d8ab8736e08..cba135218c8 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getLoadCommandText.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getLoadCommandText.ts
@@ -5,8 +5,8 @@ import {
   getPipetteSpecsV2,
 } from '@opentrons/shared-data'
 
-import { getPipetteNameOnMount } from './getPipetteNameOnMount'
-import { getLiquidDisplayName } from './getLiquidDisplayName'
+import { getPipetteNameOnMount } from '../getPipetteNameOnMount'
+import { getLiquidDisplayName } from '../getLiquidDisplayName'
 
 import { getLabwareName } from '/app/local-resources/labware'
 import {
@@ -15,7 +15,7 @@ import {
 } from '/app/local-resources/modules'
 
 import type { LoadLabwareRunTimeCommand } from '@opentrons/shared-data'
-import type { GetCommandText } from '..'
+import type { GetCommandText } from '../..'
 
 export const getLoadCommandText = ({
   command,
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getMoveLabwareCommandText.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getMoveLabwareCommandText.ts
similarity index 94%
rename from app/src/local-resources/commands/hooks/useCommandTextString/utils/getMoveLabwareCommandText.ts
rename to app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getMoveLabwareCommandText.ts
index 67fe3d52aaf..29e90946bb4 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getMoveLabwareCommandText.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getMoveLabwareCommandText.ts
@@ -1,13 +1,13 @@
 import { GRIPPER_WASTE_CHUTE_ADDRESSABLE_AREA } from '@opentrons/shared-data'
 
-import { getFinalLabwareLocation } from './getFinalLabwareLocation'
+import { getFinalLabwareLocation } from '../getFinalLabwareLocation'
 import {
   getLabwareName,
   getLabwareDisplayLocation,
 } from '/app/local-resources/labware'
 
 import type { MoveLabwareRunTimeCommand } from '@opentrons/shared-data'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getMoveLabwareCommandText({
   command,
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getMoveRelativeCommandText.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getMoveRelativeCommandText.ts
similarity index 86%
rename from app/src/local-resources/commands/hooks/useCommandTextString/utils/getMoveRelativeCommandText.ts
rename to app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getMoveRelativeCommandText.ts
index 7f3f8bf0aaa..d104e522fcd 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getMoveRelativeCommandText.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getMoveRelativeCommandText.ts
@@ -1,5 +1,5 @@
 import type { MoveRelativeRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getMoveRelativeCommandText({
   command,
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getMoveToAddressableAreaCommandText.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getMoveToAddressableAreaCommandText.ts
similarity index 67%
rename from app/src/local-resources/commands/hooks/useCommandTextString/utils/getMoveToAddressableAreaCommandText.ts
rename to app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getMoveToAddressableAreaCommandText.ts
index 749ef30f451..5dd4adb4ca4 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getMoveToAddressableAreaCommandText.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getMoveToAddressableAreaCommandText.ts
@@ -1,7 +1,7 @@
-import { getAddressableAreaDisplayName } from './getAddressableAreaDisplayName'
+import { getAddressableAreaDisplayName } from '../getAddressableAreaDisplayName'
 
 import type { MoveToAddressableAreaRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getMoveToAddressableAreaCommandText({
   command,
@@ -10,7 +10,7 @@ export function getMoveToAddressableAreaCommandText({
 }: HandlesCommands<MoveToAddressableAreaRunTimeCommand>): string {
   const addressableAreaDisplayName =
     commandTextData != null
-      ? getAddressableAreaDisplayName(commandTextData, command.id, t)
+      ? getAddressableAreaDisplayName(commandTextData.commands, command.id, t)
       : null
 
   return t('move_to_addressable_area', {
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getMoveToAddressabelAreaForDropTipCommandText.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getMoveToAddressableAreaForDropTipCommandText.ts
similarity index 69%
rename from app/src/local-resources/commands/hooks/useCommandTextString/utils/getMoveToAddressabelAreaForDropTipCommandText.ts
rename to app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getMoveToAddressableAreaForDropTipCommandText.ts
index f7cc0f42e1f..29cd446a9ad 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getMoveToAddressabelAreaForDropTipCommandText.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getMoveToAddressableAreaForDropTipCommandText.ts
@@ -1,7 +1,7 @@
-import { getAddressableAreaDisplayName } from './getAddressableAreaDisplayName'
+import { getAddressableAreaDisplayName } from '../getAddressableAreaDisplayName'
 
 import type { MoveToAddressableAreaForDropTipRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getMoveToAddressableAreaForDropTipCommandText({
   command,
@@ -10,7 +10,7 @@ export function getMoveToAddressableAreaForDropTipCommandText({
 }: HandlesCommands<MoveToAddressableAreaForDropTipRunTimeCommand>): string {
   const addressableAreaDisplayName =
     commandTextData != null
-      ? getAddressableAreaDisplayName(commandTextData, command.id, t)
+      ? getAddressableAreaDisplayName(commandTextData.commands, command.id, t)
       : null
 
   return t('move_to_addressable_area_drop_tip', {
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getMoveToCoordinatesCommandText.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getMoveToCoordinatesCommandText.ts
similarity index 86%
rename from app/src/local-resources/commands/hooks/useCommandTextString/utils/getMoveToCoordinatesCommandText.ts
rename to app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getMoveToCoordinatesCommandText.ts
index a3dc5ace9fe..fde6e5aff22 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getMoveToCoordinatesCommandText.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getMoveToCoordinatesCommandText.ts
@@ -1,5 +1,5 @@
 import type { MoveToCoordinatesRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getMoveToCoordinatesCommandText({
   command,
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getMoveToSlotCommandText.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getMoveToSlotCommandText.ts
similarity index 85%
rename from app/src/local-resources/commands/hooks/useCommandTextString/utils/getMoveToSlotCommandText.ts
rename to app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getMoveToSlotCommandText.ts
index b66f5d78513..75904b7cb43 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getMoveToSlotCommandText.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getMoveToSlotCommandText.ts
@@ -1,5 +1,5 @@
 import type { MoveToSlotRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getMoveToSlotCommandText({
   command,
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getMoveToWellCommandText.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getMoveToWellCommandText.ts
similarity index 91%
rename from app/src/local-resources/commands/hooks/useCommandTextString/utils/getMoveToWellCommandText.ts
rename to app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getMoveToWellCommandText.ts
index e3c8d6223be..50bdba0a52f 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getMoveToWellCommandText.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getMoveToWellCommandText.ts
@@ -3,10 +3,10 @@ import {
   getLabwareDisplayLocation,
 } from '/app/local-resources/labware'
 
-import { getFinalLabwareLocation } from './getFinalLabwareLocation'
+import { getFinalLabwareLocation } from '../getFinalLabwareLocation'
 
 import type { MoveToWellRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getMoveToWellCommandText({
   command,
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getPipettingCommandText.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getPipettingCommandText.ts
similarity index 88%
rename from app/src/local-resources/commands/hooks/useCommandTextString/utils/getPipettingCommandText.ts
rename to app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getPipettingCommandText.ts
index 34ad5eae3a3..6ef1369691e 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getPipettingCommandText.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getPipettingCommandText.ts
@@ -1,7 +1,7 @@
 import { getLabwareDefURI } from '@opentrons/shared-data'
 
-import { getFinalLabwareLocation } from './getFinalLabwareLocation'
-import { getWellRange } from './getWellRange'
+import { getFinalLabwareLocation } from '../getFinalLabwareLocation'
+import { getWellRange } from '../getWellRange'
 
 import {
   getLabwareDefinitionsFromCommands,
@@ -11,7 +11,9 @@ import {
 } from '/app/local-resources/labware'
 
 import type { PipetteName, RunTimeCommand } from '@opentrons/shared-data'
-import type { GetCommandText } from '..'
+import type { GetCommandText } from '../..'
+import { getFinalMoveToAddressableAreaCmd } from '/app/local-resources/commands/hooks/useCommandTextString/utils/getFinalAddressableAreaCmd'
+import { getAddressableAreaDisplayName } from '/app/local-resources/commands/hooks/useCommandTextString/utils/getAddressableAreaDisplayName'
 
 export const getPipettingCommandText = ({
   command,
@@ -186,7 +188,14 @@ export const getPipettingCommandText = ({
       })
     }
     case 'dropTipInPlace': {
-      return t('drop_tip_in_place')
+      const cmd = getFinalMoveToAddressableAreaCmd(allPreviousCommands ?? [])
+
+      if (cmd != null) {
+        const displayName = getAddressableAreaDisplayName([cmd], cmd?.id, t)
+        return t('dropping_tip_in_trash', { trash: displayName })
+      } else {
+        return t('drop_tip_in_place')
+      }
     }
     case 'dispenseInPlace': {
       const { volume, flowRate } = command.params
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getPrepareToAspirateCommandText.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getPrepareToAspirateCommandText.ts
similarity index 92%
rename from app/src/local-resources/commands/hooks/useCommandTextString/utils/getPrepareToAspirateCommandText.ts
rename to app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getPrepareToAspirateCommandText.ts
index 13d32b6b7d6..f0d68c3fd4d 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getPrepareToAspirateCommandText.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getPrepareToAspirateCommandText.ts
@@ -1,7 +1,7 @@
 import { getPipetteSpecsV2 } from '@opentrons/shared-data'
 
 import type { PrepareToAspirateRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getPrepareToAspirateCommandText({
   command,
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getRailLightsCommandText.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getRailLightsCommandText.ts
similarity index 89%
rename from app/src/local-resources/commands/hooks/useCommandTextString/utils/getRailLightsCommandText.ts
rename to app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getRailLightsCommandText.ts
index b731d3ec392..8fe4c18aa4b 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getRailLightsCommandText.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getRailLightsCommandText.ts
@@ -1,5 +1,5 @@
 import type { RunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 type HandledCommands = Extract<RunTimeCommand, { commandType: 'setRailLights' }>
 
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getTCRunExtendedProfileCommandText.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getTCRunExtendedProfileCommandText.ts
similarity index 97%
rename from app/src/local-resources/commands/hooks/useCommandTextString/utils/getTCRunExtendedProfileCommandText.ts
rename to app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getTCRunExtendedProfileCommandText.ts
index 4c4acde0b6f..2d09f07f28c 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getTCRunExtendedProfileCommandText.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getTCRunExtendedProfileCommandText.ts
@@ -4,8 +4,8 @@ import type {
   TCProfileCycle,
   AtomicProfileStep,
 } from '@opentrons/shared-data/command'
-import type { GetTCRunExtendedProfileCommandTextResult } from '..'
-import type { HandlesCommands } from './types'
+import type { GetTCRunExtendedProfileCommandTextResult } from '../..'
+import type { HandlesCommands } from '../types'
 
 export interface TCProfileStepText {
   kind: 'step'
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getTCRunProfileCommandText.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getTCRunProfileCommandText.ts
similarity index 87%
rename from app/src/local-resources/commands/hooks/useCommandTextString/utils/getTCRunProfileCommandText.ts
rename to app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getTCRunProfileCommandText.ts
index cbc56b02635..a98ce9cfa4a 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getTCRunProfileCommandText.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getTCRunProfileCommandText.ts
@@ -1,7 +1,7 @@
 import { formatDurationLabeled } from '/app/transformations/commands'
 import type { TCRunProfileRunTimeCommand } from '@opentrons/shared-data/command'
-import type { GetTCRunProfileCommandTextResult } from '..'
-import type { HandlesCommands } from './types'
+import type { GetTCRunProfileCommandTextResult } from '../..'
+import type { HandlesCommands } from '../types'
 
 export function getTCRunProfileCommandText({
   command,
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getTemperatureCommandText.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getTemperatureCommandText.ts
similarity index 97%
rename from app/src/local-resources/commands/hooks/useCommandTextString/utils/getTemperatureCommandText.ts
rename to app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getTemperatureCommandText.ts
index ee60a76c289..1b5a03745c3 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getTemperatureCommandText.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getTemperatureCommandText.ts
@@ -6,7 +6,7 @@ import type {
   HeaterShakerSetTargetTemperatureCreateCommand,
   RunTimeCommand,
 } from '@opentrons/shared-data'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export type TemperatureCreateCommand =
   | TemperatureModuleSetTargetTemperatureCreateCommand
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getUnknownCommandText.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getUnknownCommandText.ts
similarity index 71%
rename from app/src/local-resources/commands/hooks/useCommandTextString/utils/getUnknownCommandText.ts
rename to app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getUnknownCommandText.ts
index 4f2346c7c01..17b69b84c6a 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getUnknownCommandText.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getUnknownCommandText.ts
@@ -1,4 +1,4 @@
-import type { GetCommandText } from '..'
+import type { GetCommandText } from '../..'
 
 export function getUnknownCommandText({ command }: GetCommandText): string {
   return JSON.stringify(command)
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getWaitForDurationCommandText.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getWaitForDurationCommandText.ts
similarity index 87%
rename from app/src/local-resources/commands/hooks/useCommandTextString/utils/getWaitForDurationCommandText.ts
rename to app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getWaitForDurationCommandText.ts
index d3b3136be1f..18ccc55540a 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getWaitForDurationCommandText.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getWaitForDurationCommandText.ts
@@ -1,5 +1,5 @@
 import type { WaitForDurationRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getWaitForDurationCommandText({
   command,
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getWaitForResumeCommandText.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getWaitForResumeCommandText.ts
similarity index 87%
rename from app/src/local-resources/commands/hooks/useCommandTextString/utils/getWaitForResumeCommandText.ts
rename to app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getWaitForResumeCommandText.ts
index f1c7b7fcef6..a591504b244 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getWaitForResumeCommandText.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/getWaitForResumeCommandText.ts
@@ -1,5 +1,5 @@
 import type { WaitForResumeRunTimeCommand } from '@opentrons/shared-data/command'
-import type { HandlesCommands } from './types'
+import type { HandlesCommands } from '../types'
 
 export function getWaitForResumeCommandText({
   command,
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/index.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/index.ts
new file mode 100644
index 00000000000..c2926c880c6
--- /dev/null
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/commandText/index.ts
@@ -0,0 +1,26 @@
+export * from './getLoadCommandText'
+export * from './getTemperatureCommandText'
+export * from './getTCRunProfileCommandText'
+export * from './getTCRunExtendedProfileCommandText'
+export * from './getHSShakeSpeedCommandText'
+export * from './getMoveToSlotCommandText'
+export * from './getMoveRelativeCommandText'
+export * from './getMoveToCoordinatesCommandText'
+export * from './getMoveToWellCommandText'
+export * from './getMoveLabwareCommandText'
+export * from './getConfigureForVolumeCommandText'
+export * from './getConfigureNozzleLayoutCommandText'
+export * from './getPrepareToAspirateCommandText'
+export * from './getMoveToAddressableAreaCommandText'
+export * from './getMoveToAddressableAreaForDropTipCommandText'
+export * from './getDirectTranslationCommandText'
+export * from './getWaitForDurationCommandText'
+export * from './getWaitForResumeCommandText'
+export * from './getDelayCommandText'
+export * from './getCommentCommandText'
+export * from './getCustomCommandText'
+export * from './getUnknownCommandText'
+export * from './getPipettingCommandText'
+export * from './getLiquidProbeCommandText'
+export * from './getRailLightsCommandText'
+export * from './getAbsorbanceReaderCommandText'
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getAddressableAreaDisplayName.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/getAddressableAreaDisplayName.ts
index 20d7c6cca07..c3160de6223 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getAddressableAreaDisplayName.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/getAddressableAreaDisplayName.ts
@@ -1,17 +1,16 @@
 import type {
   AddressableAreaName,
   MoveToAddressableAreaParams,
+  RunTimeCommand,
 } from '@opentrons/shared-data'
 import type { TFunction } from 'i18next'
 
-import type { CommandTextData } from '/app/local-resources/commands'
-
 export function getAddressableAreaDisplayName(
-  commandTextData: CommandTextData,
+  commands: RunTimeCommand[] | undefined,
   commandId: string,
   t: TFunction
 ): string {
-  const addressableAreaCommand = (commandTextData?.commands ?? []).find(
+  const addressableAreaCommand = (commands ?? []).find(
     command => command.id === commandId
   )
 
@@ -30,8 +29,11 @@ export function getAddressableAreaDisplayName(
     return t('trash_bin_in_slot', { slot_name: slotName })
   } else if (addressableAreaName.includes('WasteChute')) {
     return t('waste_chute')
-  } else if (addressableAreaName === 'fixedTrash') return t('fixed_trash')
-  else return addressableAreaName
+  } else if (addressableAreaName === 'fixedTrash') {
+    return t('fixed_trash')
+  } else {
+    return addressableAreaName
+  }
 }
 
 const getMovableTrashSlot = (
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getFinalAddressableAreaCmd.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/getFinalAddressableAreaCmd.ts
new file mode 100644
index 00000000000..3471073a8b9
--- /dev/null
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/getFinalAddressableAreaCmd.ts
@@ -0,0 +1,21 @@
+import { findLastAt } from '/app/local-resources/commands/hooks/useCommandTextString/utils/helpers'
+
+import type { RunTimeCommand } from '@opentrons/shared-data'
+/**
+ * given a list of commands and a labwareId, calculate the resulting location
+ * of the corresponding labware after all given commands are executed
+ * @param commands list of commands to search within
+ * @returns The last command related to addressable areas.
+ */
+export function getFinalMoveToAddressableAreaCmd(
+  commands: RunTimeCommand[]
+): RunTimeCommand | null {
+  const [cmd] = findLastAt(
+    commands,
+    (c: RunTimeCommand) =>
+      c.commandType === 'moveToAddressableArea' ||
+      c.commandType === 'moveToAddressableAreaForDropTip'
+  )
+
+  return cmd ?? null
+}
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getFinalLabwareLocation.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/getFinalLabwareLocation.ts
index e674794a265..7e73770cbbd 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/getFinalLabwareLocation.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/getFinalLabwareLocation.ts
@@ -1,3 +1,5 @@
+import { findLastAt } from './helpers'
+
 import type {
   LabwareLocation,
   RunTimeCommand,
@@ -5,22 +7,6 @@ import type {
   MoveLabwareRunTimeCommand,
 } from '@opentrons/shared-data'
 
-const findLastAt = <T, U extends T = T>(
-  arr: readonly T[],
-  pred: ((el: T) => boolean) | ((el: T) => el is U)
-): [U, number] | [undefined, -1] => {
-  let arrayLoc = -1
-  const lastEl = arr.findLast((el: T, idx: number): el is U => {
-    arrayLoc = idx
-    return pred(el)
-  })
-  if (lastEl === undefined) {
-    return [undefined, -1]
-  } else {
-    return [lastEl, arrayLoc]
-  }
-}
-
 /**
  * given a list of commands and a labwareId, calculate the resulting location
  * of the corresponding labware after all given commands are executed
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/helpers.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/helpers.ts
new file mode 100644
index 00000000000..5d28c41b82c
--- /dev/null
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/helpers.ts
@@ -0,0 +1,15 @@
+export const findLastAt = <T, U extends T = T>(
+  arr: readonly T[],
+  pred: ((el: T) => boolean) | ((el: T) => el is U)
+): [U, number] | [undefined, -1] => {
+  let arrayLoc = -1
+  const lastEl = arr.findLast((el: T, idx: number): el is U => {
+    arrayLoc = idx
+    return pred(el)
+  })
+  if (lastEl === undefined) {
+    return [undefined, -1]
+  } else {
+    return [lastEl, arrayLoc]
+  }
+}
diff --git a/app/src/local-resources/commands/hooks/useCommandTextString/utils/index.ts b/app/src/local-resources/commands/hooks/useCommandTextString/utils/index.ts
index 76659ca1222..44f99055f08 100644
--- a/app/src/local-resources/commands/hooks/useCommandTextString/utils/index.ts
+++ b/app/src/local-resources/commands/hooks/useCommandTextString/utils/index.ts
@@ -1,26 +1,2 @@
-export { getLoadCommandText } from './getLoadCommandText'
-export { getTemperatureCommandText } from './getTemperatureCommandText'
-export { getTCRunProfileCommandText } from './getTCRunProfileCommandText'
-export { getTCRunExtendedProfileCommandText } from './getTCRunExtendedProfileCommandText'
-export { getHSShakeSpeedCommandText } from './getHSShakeSpeedCommandText'
-export { getMoveToSlotCommandText } from './getMoveToSlotCommandText'
-export { getMoveRelativeCommandText } from './getMoveRelativeCommandText'
-export { getMoveToCoordinatesCommandText } from './getMoveToCoordinatesCommandText'
-export { getMoveToWellCommandText } from './getMoveToWellCommandText'
-export { getMoveLabwareCommandText } from './getMoveLabwareCommandText'
-export { getConfigureForVolumeCommandText } from './getConfigureForVolumeCommandText'
-export { getConfigureNozzleLayoutCommandText } from './getConfigureNozzleLayoutCommandText'
-export { getPrepareToAspirateCommandText } from './getPrepareToAspirateCommandText'
-export { getMoveToAddressableAreaCommandText } from './getMoveToAddressableAreaCommandText'
-export { getMoveToAddressableAreaForDropTipCommandText } from './getMoveToAddressabelAreaForDropTipCommandText'
-export { getDirectTranslationCommandText } from './getDirectTranslationCommandText'
-export { getWaitForDurationCommandText } from './getWaitForDurationCommandText'
-export { getWaitForResumeCommandText } from './getWaitForResumeCommandText'
-export { getDelayCommandText } from './getDelayCommandText'
-export { getCommentCommandText } from './getCommentCommandText'
-export { getCustomCommandText } from './getCustomCommandText'
-export { getUnknownCommandText } from './getUnknownCommandText'
-export { getPipettingCommandText } from './getPipettingCommandText'
-export { getLiquidProbeCommandText } from './getLiquidProbeCommandText'
-export { getRailLightsCommandText } from './getRailLightsCommandText'
-export { getAbsorbanceReaderCommandText } from './getAbsorbanceReaderCommandText'
+export * from './commandText'
+export * from './types'
diff --git a/app/src/molecules/Command/__tests__/CommandText.test.tsx b/app/src/molecules/Command/__tests__/CommandText.test.tsx
index 6999063be38..f2762b622d7 100644
--- a/app/src/molecules/Command/__tests__/CommandText.test.tsx
+++ b/app/src/molecules/Command/__tests__/CommandText.test.tsx
@@ -444,7 +444,7 @@ describe('CommandText', () => {
       />,
       { i18nInstance: i18n }
     )
-    screen.getByText('Dropping tip in place')
+    screen.getByText('Dropping tip in D3')
   })
   it('renders correct text for pickUpTip', () => {
     const command = mockCommandTextData.commands.find(