diff --git a/src/__tests__/commands/apps/create.test.ts b/src/__tests__/commands/apps/create.test.ts
index 2b4c3310..452699cf 100644
--- a/src/__tests__/commands/apps/create.test.ts
+++ b/src/__tests__/commands/apps/create.test.ts
@@ -18,7 +18,7 @@ import type {
 } from '../../../lib/command/input-and-output-item.js'
 import { InputProcessor, userInputProcessor } from '../../../lib/command/input-processor.js'
 import { type authorizeApp, tableFieldDefinitions } from '../../../lib/command/util/apps-util.js'
-import { getAppCreateRequestFromUser } from '../../../lib/command/util/apps-util-user-input.js'
+import { getAppCreateRequestFromUser } from '../../../lib/command/util/apps-user-input-create.js'
 import type { CommandArgs } from '../../../commands/apps/create.js'
 import { apiCommandMocks } from '../../test-lib/api-command-mock.js'
 import { buildArgvMock, buildArgvMockStub } from '../../test-lib/builder-mock.js'
@@ -59,7 +59,7 @@ jest.unstable_mockModule('../../../lib/command/util/apps-util.js', () => ({
 }))
 
 const getAppCreateRequestFromUserMock = jest.fn<typeof getAppCreateRequestFromUser>()
-jest.unstable_mockModule('../../../lib/command/util/apps-util-user-input.js', () => ({
+jest.unstable_mockModule('../../../lib/command/util/apps-user-input-create.js', () => ({
 	getAppCreateRequestFromUser: getAppCreateRequestFromUserMock,
 }))
 
diff --git a/src/__tests__/commands/apps/oauth/generate.test.ts b/src/__tests__/commands/apps/oauth/generate.test.ts
index 7d28f725..c41fd27f 100644
--- a/src/__tests__/commands/apps/oauth/generate.test.ts
+++ b/src/__tests__/commands/apps/oauth/generate.test.ts
@@ -50,7 +50,7 @@ jest.unstable_mockModule('../../../../lib/command/util/apps-util.js', () => ({
 }))
 
 const oauthAppScopeDefMock = buildInputDefMock<string>('Scopes Mock')
-jest.unstable_mockModule('../../../../lib/command/util/apps-util-input-primitives.js', () => ({
+jest.unstable_mockModule('../../../../lib/command/util/apps-input-primitives.js', () => ({
 	oauthAppScopeDef: oauthAppScopeDefMock,
 }))
 
diff --git a/src/__tests__/commands/apps/oauth/update.test.ts b/src/__tests__/commands/apps/oauth/update.test.ts
index c7ff23cd..124b3ce1 100644
--- a/src/__tests__/commands/apps/oauth/update.test.ts
+++ b/src/__tests__/commands/apps/oauth/update.test.ts
@@ -53,7 +53,7 @@ jest.unstable_mockModule('../../../../lib/command/util/apps-util.js', () => ({
 
 const oauthAppScopeDefMock = buildInputDefMock<string>('Scopes Mock')
 const redirectUrisDefMock = buildInputDefMock<string>('Redirect URIs Mock')
-jest.unstable_mockModule('../../../../lib/command/util/apps-util-input-primitives.js', () => ({
+jest.unstable_mockModule('../../../../lib/command/util/apps-input-primitives.js', () => ({
 	oauthAppScopeDef: oauthAppScopeDefMock,
 	redirectUrisDef: redirectUrisDefMock,
 }))
diff --git a/src/__tests__/commands/apps/update.test.ts b/src/__tests__/commands/apps/update.test.ts
index 19f6b81a..c0f2badd 100644
--- a/src/__tests__/commands/apps/update.test.ts
+++ b/src/__tests__/commands/apps/update.test.ts
@@ -60,7 +60,7 @@ jest.unstable_mockModule('../../../lib/command/util/apps-user-input-update.js',
 	getAppUpdateRequestFromUser: getAppUpdateRequestFromUserMock,
 }))
 
-jest.unstable_mockModule('../../../lib/command/util/apps-util-input-primitives.js', () => ({
+jest.unstable_mockModule('../../../lib/command/util/apps-input-primitives.js', () => ({
 	smartAppHelpText: 'smartapp help text',
 }))
 
diff --git a/src/__tests__/lib/command/util/apps-util-input-primitives.test.ts b/src/__tests__/lib/command/util/apps-input-primitives.test.ts
similarity index 95%
rename from src/__tests__/lib/command/util/apps-util-input-primitives.test.ts
rename to src/__tests__/lib/command/util/apps-input-primitives.test.ts
index b79ee2ed..dfcb4565 100644
--- a/src/__tests__/lib/command/util/apps-util-input-primitives.test.ts
+++ b/src/__tests__/lib/command/util/apps-input-primitives.test.ts
@@ -31,7 +31,7 @@ arrayDefMock.mockReturnValueOnce(redirectUrisDefMock)
 const {
 	oauthAppScopeDef,
 	redirectUrisDef,
-} = await import('../../../../lib/command/util/apps-util-input-primitives.js')
+} = await import('../../../../lib/command/util/apps-input-primitives.js')
 
 
 expect(oauthAppScopeDef).toBe(oauthAppScopeDefMock)
diff --git a/src/__tests__/lib/command/util/apps-util-user-input.test.ts b/src/__tests__/lib/command/util/apps-user-input-create.test.ts
similarity index 97%
rename from src/__tests__/lib/command/util/apps-util-user-input.test.ts
rename to src/__tests__/lib/command/util/apps-user-input-create.test.ts
index 56cddb8f..6ab671fc 100644
--- a/src/__tests__/lib/command/util/apps-util-user-input.test.ts
+++ b/src/__tests__/lib/command/util/apps-user-input-create.test.ts
@@ -27,7 +27,7 @@ import type {
 } from '../../../../lib/item-input/index.js'
 import type {
 	getAppCreateRequestFromUser as getAppCreateRequestFromUserForType,
-} from '../../../../lib/command/util/apps-util-user-input.js'
+} from '../../../../lib/command/util/apps-user-input-create.js'
 import { buildInputDefMock } from '../../../test-lib/input-type-mock.js'
 
 
@@ -76,7 +76,7 @@ jest.unstable_mockModule('../../../../lib/item-input/index.js', () => ({
 
 const oauthAppScopeDefMock = buildInputDefMock('Scopes Mock')
 const redirectUrisDefMock = buildInputDefMock('Redirect URIs Mock')
-jest.unstable_mockModule('../../../../lib/command/util/apps-util-input-primitives.js', () => ({
+jest.unstable_mockModule('../../../../lib/command/util/apps-input-primitives.js', () => ({
 	oauthAppScopeDef: oauthAppScopeDefMock,
 	redirectUrisDef: redirectUrisDefMock,
 	smartAppHelpText: 'smartapp help text',
@@ -102,7 +102,7 @@ test('module initialization', async () => {
 	objectDefMock.mockReturnValueOnce(oauthDefMock)
 	objectDefMock.mockReturnValueOnce(oauthAppCreateRequestDefMock)
 
-	getAppCreateRequestFromUser = (await import('../../../../lib/command/util/apps-util-user-input.js'))
+	getAppCreateRequestFromUser = (await import('../../../../lib/command/util/apps-user-input-create.js'))
 		.getAppCreateRequestFromUser
 
 	expect(computedDefMock).toHaveBeenCalledTimes(2)
diff --git a/src/__tests__/lib/command/util/apps-user-input-update.test.ts b/src/__tests__/lib/command/util/apps-user-input-update.test.ts
index a6cb1f28..1e71d47f 100644
--- a/src/__tests__/lib/command/util/apps-user-input-update.test.ts
+++ b/src/__tests__/lib/command/util/apps-user-input-update.test.ts
@@ -52,7 +52,7 @@ jest.unstable_mockModule('../../../../lib/item-input/index.js', () => ({
 	updateFromUserInput: updateFromUserInputMock,
 }))
 
-jest.unstable_mockModule('../../../../lib/command//util/apps-util-input-primitives.js', () => ({
+jest.unstable_mockModule('../../../../lib/command//util/apps-input-primitives.js', () => ({
 	smartAppHelpText: 'smartapp help text',
 }))
 
diff --git a/src/__tests__/lib/command/util/schema-util-input-primitives.test.ts b/src/__tests__/lib/command/util/schema-input-primitives.test.ts
similarity index 98%
rename from src/__tests__/lib/command/util/schema-util-input-primitives.test.ts
rename to src/__tests__/lib/command/util/schema-input-primitives.test.ts
index d236b708..4c3191f7 100644
--- a/src/__tests__/lib/command/util/schema-util-input-primitives.test.ts
+++ b/src/__tests__/lib/command/util/schema-input-primitives.test.ts
@@ -49,7 +49,7 @@ jest.unstable_mockModule('../../../../lib/item-input/index.js', () => ({
 const {
 	arnDef,
 	webHookUrlDef,
-} = await import('../../../../lib/command/util/schema-util-input-primitives.js')
+} = await import('../../../../lib/command/util/schema-input-primitives.js')
 
 
 const generatedStringDef = { name: 'Generated String Def' } as InputDefinition<string>
diff --git a/src/__tests__/lib/command/util/schema-util.test.ts b/src/__tests__/lib/command/util/schema-util.test.ts
index 0103823b..cb2a30b4 100644
--- a/src/__tests__/lib/command/util/schema-util.test.ts
+++ b/src/__tests__/lib/command/util/schema-util.test.ts
@@ -32,7 +32,7 @@ import type {
 import type {
 	arnDef,
 	webHookUrlDef,
-} from '../../../../lib/command/util/schema-util-input-primitives.js'
+} from '../../../../lib/command/util/schema-input-primitives.js'
 import type {
 	createChooseFn,
 	ChooseFunction,
@@ -84,7 +84,7 @@ jest.unstable_mockModule('../../../../lib/item-input/index.js', () => ({
 
 const arnDefMock = jest.fn<typeof arnDef>()
 const webHookUrlDefMock = jest.fn<typeof webHookUrlDef>()
-jest.unstable_mockModule('../../../../lib/command/util/schema-util-input-primitives.js', () => ({
+jest.unstable_mockModule('../../../../lib/command/util/schema-input-primitives.js', () => ({
 	arnDef: arnDefMock,
 	webHookUrlDef: webHookUrlDefMock,
 }))
diff --git a/src/commands/apps/create.ts b/src/commands/apps/create.ts
index 24afef6b..24ff2ab7 100644
--- a/src/commands/apps/create.ts
+++ b/src/commands/apps/create.ts
@@ -19,7 +19,7 @@ import {
 	authorizeApp,
 	tableFieldDefinitions,
 } from '../../lib/command/util/apps-util.js'
-import { getAppCreateRequestFromUser } from '../../lib/command/util/apps-util-user-input.js'
+import { getAppCreateRequestFromUser } from '../../lib/command/util/apps-user-input-create.js'
 
 
 export type CommandArgs = APICommandFlags & InputAndOutputItemFlags & LambdaAuthFlags & {
diff --git a/src/commands/apps/oauth/generate.ts b/src/commands/apps/oauth/generate.ts
index 1af32cfe..748d73ad 100644
--- a/src/commands/apps/oauth/generate.ts
+++ b/src/commands/apps/oauth/generate.ts
@@ -18,7 +18,7 @@ import {
 } from '../../../lib/command/input-and-output-item.js'
 import { inputProcessor } from '../../../lib/command/input-processor.js'
 import { chooseApp } from '../../../lib/command/util/apps-util.js'
-import { oauthAppScopeDef } from '../../../lib/command/util/apps-util-input-primitives.js'
+import { oauthAppScopeDef } from '../../../lib/command/util/apps-input-primitives.js'
 import { objectDef, stringDef, updateFromUserInput } from '../../../lib/item-input/index.js'
 
 
diff --git a/src/commands/apps/oauth/update.ts b/src/commands/apps/oauth/update.ts
index 0eb3fd3b..0804bab5 100644
--- a/src/commands/apps/oauth/update.ts
+++ b/src/commands/apps/oauth/update.ts
@@ -19,7 +19,7 @@ import { chooseApp, oauthTableFieldDefinitions } from '../../../lib/command/util
 import {
 	oauthAppScopeDef,
 	redirectUrisDef,
-} from '../../../lib/command/util/apps-util-input-primitives.js'
+} from '../../../lib/command/util/apps-input-primitives.js'
 import { objectDef, stringDef, updateFromUserInput } from '../../../lib/item-input/index.js'
 
 
diff --git a/src/lib/command/util/apps-util-input-primitives.ts b/src/lib/command/util/apps-input-primitives.ts
similarity index 100%
rename from src/lib/command/util/apps-util-input-primitives.ts
rename to src/lib/command/util/apps-input-primitives.ts
diff --git a/src/lib/command/util/apps-util-user-input.ts b/src/lib/command/util/apps-user-input-create.ts
similarity index 98%
rename from src/lib/command/util/apps-util-user-input.ts
rename to src/lib/command/util/apps-user-input-create.ts
index 4f5680ff..66d5333b 100644
--- a/src/lib/command/util/apps-util-user-input.ts
+++ b/src/lib/command/util/apps-user-input-create.ts
@@ -19,7 +19,7 @@ import {
 	staticDef,
 	stringDef,
 } from '../../item-input/index.js'
-import { oauthAppScopeDef, redirectUrisDef, smartAppHelpText } from './apps-util-input-primitives.js'
+import { oauthAppScopeDef, redirectUrisDef, smartAppHelpText } from './apps-input-primitives.js'
 import type { InputAndOutputItemFlags } from '../input-and-output-item.js'
 import { type SmartThingsCommandFlags, type SmartThingsCommand } from '../smartthings-command.js'
 
diff --git a/src/lib/command/util/apps-user-input-update.ts b/src/lib/command/util/apps-user-input-update.ts
index 5c12616b..df9ff39d 100644
--- a/src/lib/command/util/apps-user-input-update.ts
+++ b/src/lib/command/util/apps-user-input-update.ts
@@ -15,7 +15,7 @@ import {
 	updateFromUserInput,
 } from '../../item-input/index.js'
 import { type APICommand } from '../api-command.js'
-import { smartAppHelpText } from './apps-util-input-primitives.js'
+import { smartAppHelpText } from './apps-input-primitives.js'
 import { type InputAndOutputItemFlags } from '../input-and-output-item.js'
 
 
diff --git a/src/lib/command/util/schema-util-input-primitives.ts b/src/lib/command/util/schema-input-primitives.ts
similarity index 100%
rename from src/lib/command/util/schema-util-input-primitives.ts
rename to src/lib/command/util/schema-input-primitives.ts
diff --git a/src/lib/command/util/schema-util.ts b/src/lib/command/util/schema-util.ts
index d0119f8b..09f9d6ea 100644
--- a/src/lib/command/util/schema-util.ts
+++ b/src/lib/command/util/schema-util.ts
@@ -23,7 +23,7 @@ import { clipToMaximum, fatalError } from '../../util.js'
 import { emailValidate, httpsURLValidate } from '../../validate-util.js'
 import { type APICommand } from '../api-command.js'
 import { chooseOrganization, organizationDef } from './organizations-util.js'
-import { arnDef, webHookUrlDef } from './schema-util-input-primitives.js'
+import { arnDef, webHookUrlDef } from './schema-input-primitives.js'
 import { type ChooseFunction, createChooseFn } from './util-util.js'
 import { stdinIsTTY, stdoutIsTTY } from '../../io-util.js'