diff --git a/scripts/postrelease/install_scripts.js b/scripts/postrelease/install_scripts.js
index 05fdff9dc2..2710529fc3 100755
--- a/scripts/postrelease/install_scripts.js
+++ b/scripts/postrelease/install_scripts.js
@@ -4,8 +4,8 @@ import execa from 'execa'
 import qq from 'qqjs'
 import path from 'path'
 import { fileURLToPath } from 'url'
-import getHerokuS3Bucket from '../utils/getHerokuS3Bucket.js'
-import isStableRelease from '../utils/isStableRelease.js'
+import getHerokuS3Bucket from '../utils/get-heroku-s3-bucket.js'
+import isStableRelease from '../utils/is-stable-release.js'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
diff --git a/scripts/release/homebrew.js b/scripts/release/homebrew.js
index ec0767c45e..ecc135b5ef 100755
--- a/scripts/release/homebrew.js
+++ b/scripts/release/homebrew.js
@@ -6,8 +6,8 @@ import { rimrafSync } from 'rimraf'
 import { promisify } from 'util'
 import { pipeline } from 'stream'
 import crypto from 'crypto'
-import getHerokuS3Bucket from '../utils/getHerokuS3Bucket.js'
-import isStableRelease from '../utils/isStableRelease.js'
+import getHerokuS3Bucket from '../utils/get-heroku-s3-bucket.js'
+import isStableRelease from '../utils/is-stable-release.js'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
diff --git a/scripts/upload/deb b/scripts/upload/deb
index 4910b1e624..3387a5cd74 100755
--- a/scripts/upload/deb
+++ b/scripts/upload/deb
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import qq from 'qqjs'
-import getHerokuS3Bucket from '../utils/getHerokuS3Bucket.js'
+import getHerokuS3Bucket from '../utils/get-heroku-s3-bucket.js'
 
 qq.config.silent = false
 qq.run(async () => {
diff --git a/scripts/utils/getHerokuS3Bucket.js b/scripts/utils/get-heroku-s3-bucket.js
similarity index 100%
rename from scripts/utils/getHerokuS3Bucket.js
rename to scripts/utils/get-heroku-s3-bucket.js
diff --git a/scripts/utils/isStableRelease.js b/scripts/utils/is-stable-release.js
similarity index 100%
rename from scripts/utils/isStableRelease.js
rename to scripts/utils/is-stable-release.js
diff --git a/src/commands/access/add.ts b/src/commands/access/add.ts
index 8700aa94a9..765939ba9e 100644
--- a/src/commands/access/add.ts
+++ b/src/commands/access/add.ts
@@ -3,7 +3,7 @@ import * as Heroku from '@heroku-cli/schema'
 import * as color from '@heroku/heroku-cli-util/color'
 import {Args, ux} from '@oclif/core'
 
-import {getOwner, isTeamApp} from '../../lib/teamUtils.js'
+import {getOwner, isTeamApp} from '../../lib/team-utils.js'
 
 export default class AccessAdd extends Command {
   static args = {
diff --git a/src/commands/access/index.ts b/src/commands/access/index.ts
index a45ad362ea..f5e57b795b 100644
--- a/src/commands/access/index.ts
+++ b/src/commands/access/index.ts
@@ -5,7 +5,7 @@ import {color, hux} from '@heroku/heroku-cli-util'
 import {ux} from '@oclif/core/ux'
 
 import {lazyModuleLoader} from '../../lib/lazy-module-loader.js'
-import {getOwner, isTeamApp} from '../../lib/teamUtils.js'
+import {getOwner, isTeamApp} from '../../lib/team-utils.js'
 
 type AdminWithPermissions = Heroku.TeamMember & {
   permissions?: Heroku.TeamAppPermission[],
diff --git a/src/commands/access/update.ts b/src/commands/access/update.ts
index 2c6823e7f7..a962e1c7d6 100644
--- a/src/commands/access/update.ts
+++ b/src/commands/access/update.ts
@@ -3,7 +3,7 @@ import * as Heroku from '@heroku-cli/schema'
 import * as color from '@heroku/heroku-cli-util/color'
 import {Args, ux} from '@oclif/core'
 
-import {isTeamApp} from '../../lib/teamUtils.js'
+import {isTeamApp} from '../../lib/team-utils.js'
 
 export default class Update extends Command {
   static args = {
diff --git a/src/commands/addons/create.ts b/src/commands/addons/create.ts
index 91e34bf604..3079b3cf1a 100644
--- a/src/commands/addons/create.ts
+++ b/src/commands/addons/create.ts
@@ -4,7 +4,7 @@ import * as color from '@heroku/heroku-cli-util/color'
 import {Args, ux} from '@oclif/core'
 import tsheredoc from 'tsheredoc'
 
-import createAddon from '../../lib/addons/create_addon.js'
+import createAddon from '../../lib/addons/create-addon.js'
 import * as util from '../../lib/addons/util.js'
 import notify from '../../lib/notify.js'
 
diff --git a/src/commands/addons/destroy.ts b/src/commands/addons/destroy.ts
index 284af61a31..f9b94cf60b 100644
--- a/src/commands/addons/destroy.ts
+++ b/src/commands/addons/destroy.ts
@@ -4,8 +4,8 @@ import * as Heroku from '@heroku-cli/schema'
 import {Args} from '@oclif/core'
 import _ from 'lodash'
 
-import destroyAddon from '../../lib/addons/destroy_addon.js'
-import ConfirmCommand from '../../lib/confirmCommand.js'
+import destroyAddon from '../../lib/addons/destroy-addon.js'
+import ConfirmCommand from '../../lib/confirm-command.js'
 import notify from '../../lib/notify.js'
 
 export default class Destroy extends Command {
diff --git a/src/commands/addons/index.ts b/src/commands/addons/index.ts
index 93453b8b3e..1b6cc7250d 100644
--- a/src/commands/addons/index.ts
+++ b/src/commands/addons/index.ts
@@ -5,7 +5,7 @@ import {ux} from '@oclif/core/ux'
 import _ from 'lodash'
 
 import {formatPrice, formatState, grandfatheredPrice} from '../../lib/addons/util.js'
-import {huxTableNoWrapOptions} from '../../lib/utils/tableUtils.js'
+import {huxTableNoWrapOptions} from '../../lib/utils/table-utils.js'
 
 const topic = 'addons'
 
diff --git a/src/commands/addons/wait.ts b/src/commands/addons/wait.ts
index cc5d6ceeec..605522d8af 100644
--- a/src/commands/addons/wait.ts
+++ b/src/commands/addons/wait.ts
@@ -3,7 +3,7 @@ import * as Heroku from '@heroku-cli/schema'
 import * as color from '@heroku/heroku-cli-util/color'
 import {Args, ux} from '@oclif/core'
 
-import {waitForAddonDeprovisioning, waitForAddonProvisioning} from '../../lib/addons/addons_wait.js'
+import {waitForAddonDeprovisioning, waitForAddonProvisioning} from '../../lib/addons/addons-wait.js'
 import {resolveAddon} from '../../lib/addons/resolve.js'
 import notify from '../../lib/notify.js'
 import {ExtendedAddon} from '../../lib/pg/types.js'
diff --git a/src/commands/apps/destroy.ts b/src/commands/apps/destroy.ts
index 97eeb3bd2a..57eca49832 100644
--- a/src/commands/apps/destroy.ts
+++ b/src/commands/apps/destroy.ts
@@ -3,7 +3,7 @@ import * as color from '@heroku/heroku-cli-util/color'
 import {Args, ux} from '@oclif/core'
 
 import * as git from '../../lib/ci/git.js'
-import ConfirmCommand from '../../lib/confirmCommand.js'
+import ConfirmCommand from '../../lib/confirm-command.js'
 
 export default class Destroy extends Command {
   static args = {
diff --git a/src/commands/apps/errors.ts b/src/commands/apps/errors.ts
index 8ca79fa082..ee241c3bb1 100644
--- a/src/commands/apps/errors.ts
+++ b/src/commands/apps/errors.ts
@@ -4,8 +4,8 @@ import {color, hux} from '@heroku/heroku-cli-util'
 import {HTTP} from '@heroku/http-call'
 import {ux} from '@oclif/core/ux'
 
-import errorInfo from '../../lib/apps/error_info.js'
-import {AppErrors} from '../../lib/types/app_errors.js'
+import errorInfo from '../../lib/apps/error-info.js'
+import {AppErrors} from '../../lib/types/app-errors.js'
 
 type ErrorSummary = Record<string, number>
 
diff --git a/src/commands/apps/transfer.ts b/src/commands/apps/transfer.ts
index 0ff320422d..ccdbd1e287 100644
--- a/src/commands/apps/transfer.ts
+++ b/src/commands/apps/transfer.ts
@@ -6,8 +6,8 @@ import tsheredoc from 'tsheredoc'
 
 import {appTransfer} from '../../lib/apps/app-transfer.js'
 import {lazyModuleLoader} from '../../lib/lazy-module-loader.js'
-import ConfirmCommand from '../../lib/confirmCommand.js'
-import {getOwner, isTeamApp, isValidEmail} from '../../lib/teamUtils.js'
+import ConfirmCommand from '../../lib/confirm-command.js'
+import {getOwner, isTeamApp, isValidEmail} from '../../lib/team-utils.js'
 import AppsLock from './lock.js'
 
 const heredoc = tsheredoc.default
diff --git a/src/commands/certs/add.ts b/src/commands/certs/add.ts
index 898d4641c1..8ec495bd94 100644
--- a/src/commands/certs/add.ts
+++ b/src/commands/certs/add.ts
@@ -4,11 +4,11 @@ import * as Heroku from '@heroku-cli/schema'
 import {Args, ux} from '@oclif/core'
 import tsheredoc from 'tsheredoc'
 
-import {displayCertificateDetails} from '../../lib/certs/certificate_details.js'
+import {displayCertificateDetails} from '../../lib/certs/certificate-details.js'
 import {waitForDomains} from '../../lib/certs/domains.js'
-import {CertAndKeyManager} from '../../lib/certs/get_cert_and_key.js'
+import {CertAndKeyManager} from '../../lib/certs/get-cert-and-key.js'
 import {lazyModuleLoader} from '../../lib/lazy-module-loader.js'
-import {SniEndpoint} from '../../lib/types/sni_endpoint.js'
+import {SniEndpoint} from '../../lib/types/sni-endpoint.js'
 
 const heredoc = tsheredoc.default
 
diff --git a/src/commands/certs/auto/disable.ts b/src/commands/certs/auto/disable.ts
index 10f0214f65..397b7836b1 100644
--- a/src/commands/certs/auto/disable.ts
+++ b/src/commands/certs/auto/disable.ts
@@ -3,7 +3,7 @@ import * as color from '@heroku/heroku-cli-util/color'
 import {ux} from '@oclif/core/ux'
 import tsheredoc from 'tsheredoc'
 
-import ConfirmCommand from '../../../lib/confirmCommand.js'
+import ConfirmCommand from '../../../lib/confirm-command.js'
 
 const heredoc = tsheredoc.default
 
diff --git a/src/commands/certs/auto/index.ts b/src/commands/certs/auto/index.ts
index 6e7a9ac89a..e6eff9ade0 100644
--- a/src/commands/certs/auto/index.ts
+++ b/src/commands/certs/auto/index.ts
@@ -4,11 +4,11 @@ import * as Heroku from '@heroku-cli/schema'
 import {ux} from '@oclif/core/ux'
 import tsheredoc from 'tsheredoc'
 
-import {displayCertificateDetails} from '../../../lib/certs/certificate_details.js'
+import {displayCertificateDetails} from '../../../lib/certs/certificate-details.js'
 import {waitForCertIssuedOnDomains} from '../../../lib/domains/domains.js'
 import {lazyModuleLoader} from '../../../lib/lazy-module-loader.js'
 import {Domain} from '../../../lib/types/domain.js'
-import {SniEndpoint} from '../../../lib/types/sni_endpoint.js'
+import {SniEndpoint} from '../../../lib/types/sni-endpoint.js'
 
 const heredoc = tsheredoc.default
 
diff --git a/src/commands/certs/generate.ts b/src/commands/certs/generate.ts
index b75bae3c52..8adc20cc24 100644
--- a/src/commands/certs/generate.ts
+++ b/src/commands/certs/generate.ts
@@ -3,7 +3,7 @@ import {Args} from '@oclif/core'
 import {spawn} from 'node:child_process'
 
 import {lazyModuleLoader} from '../../lib/lazy-module-loader.js'
-import {SniEndpoint} from '../../lib/types/sni_endpoint.js'
+import {SniEndpoint} from '../../lib/types/sni-endpoint.js'
 
 function getCommand(certs: SniEndpoint[], domain: string): 'update' | 'add' {
   const shouldUpdate = certs
diff --git a/src/commands/certs/index.ts b/src/commands/certs/index.ts
index 65187c65ea..cc2308c307 100644
--- a/src/commands/certs/index.ts
+++ b/src/commands/certs/index.ts
@@ -2,8 +2,8 @@ import {Command, flags} from '@heroku-cli/command'
 import * as color from '@heroku/heroku-cli-util/color'
 import {ux} from '@oclif/core/ux'
 
-import displayTable from '../../lib/certs/display_table.js'
-import {SniEndpoint} from '../../lib/types/sni_endpoint.js'
+import displayTable from '../../lib/certs/display-table.js'
+import {SniEndpoint} from '../../lib/types/sni-endpoint.js'
 
 export default class Index extends Command {
   static description = 'list SSL certificates for an app'
diff --git a/src/commands/certs/info.ts b/src/commands/certs/info.ts
index 731a9f2678..8638d0109a 100644
--- a/src/commands/certs/info.ts
+++ b/src/commands/certs/info.ts
@@ -2,10 +2,10 @@ import {Command, flags} from '@heroku-cli/command'
 import * as color from '@heroku/heroku-cli-util/color'
 import {ux} from '@oclif/core/ux'
 
-import {displayCertificateDetails} from '../../lib/certs/certificate_details.js'
+import {displayCertificateDetails} from '../../lib/certs/certificate-details.js'
 import getEndpoint from '../../lib/certs/flags.js'
 import {Domain} from '../../lib/types/domain.js'
-import {SniEndpoint} from '../../lib/types/sni_endpoint.js'
+import {SniEndpoint} from '../../lib/types/sni-endpoint.js'
 
 export default class Info extends Command {
   static description = 'show certificate information for an SSL certificate'
diff --git a/src/commands/certs/remove.ts b/src/commands/certs/remove.ts
index 89e590ac3c..62b57cc3b8 100644
--- a/src/commands/certs/remove.ts
+++ b/src/commands/certs/remove.ts
@@ -4,7 +4,7 @@ import {ux} from '@oclif/core/ux'
 import tsheredoc from 'tsheredoc'
 
 import getEndpoint from '../../lib/certs/flags.js'
-import ConfirmCommand from '../../lib/confirmCommand.js'
+import ConfirmCommand from '../../lib/confirm-command.js'
 
 const heredoc = tsheredoc.default
 
diff --git a/src/commands/certs/update.ts b/src/commands/certs/update.ts
index 0eaef6cf02..2c3e4b81b8 100644
--- a/src/commands/certs/update.ts
+++ b/src/commands/certs/update.ts
@@ -3,11 +3,11 @@ import * as color from '@heroku/heroku-cli-util/color'
 import {Args, ux} from '@oclif/core'
 import tsheredoc from 'tsheredoc'
 
-import {displayCertificateDetails} from '../../lib/certs/certificate_details.js'
+import {displayCertificateDetails} from '../../lib/certs/certificate-details.js'
 import getEndpoint from '../../lib/certs/flags.js'
-import {CertAndKeyManager} from '../../lib/certs/get_cert_and_key.js'
-import ConfirmCommand from '../../lib/confirmCommand.js'
-import {SniEndpoint} from '../../lib/types/sni_endpoint.js'
+import {CertAndKeyManager} from '../../lib/certs/get-cert-and-key.js'
+import ConfirmCommand from '../../lib/confirm-command.js'
+import {SniEndpoint} from '../../lib/types/sni-endpoint.js'
 
 const heredoc = tsheredoc.default
 
diff --git a/src/commands/container/login.ts b/src/commands/container/login.ts
index b6617dce9f..f7c7112e97 100644
--- a/src/commands/container/login.ts
+++ b/src/commands/container/login.ts
@@ -1,7 +1,7 @@
 import {Command, flags} from '@heroku-cli/command'
 import {ux} from '@oclif/core/ux'
 
-import {DockerHelper} from '../../lib/container/docker_helper.js'
+import {DockerHelper} from '../../lib/container/docker-helper.js'
 import {debug} from '../../lib/container/debug.js'
 
 export default class Login extends Command {
diff --git a/src/commands/container/logout.ts b/src/commands/container/logout.ts
index 580adbef2d..bc66742e0f 100644
--- a/src/commands/container/logout.ts
+++ b/src/commands/container/logout.ts
@@ -1,7 +1,7 @@
 import {Command, flags} from '@heroku-cli/command'
 import {ux} from '@oclif/core/ux'
 
-import {DockerHelper} from '../../lib/container/docker_helper.js'
+import {DockerHelper} from '../../lib/container/docker-helper.js'
 import {debug} from '../../lib/container/debug.js'
 
 export default class Logout extends Command {
diff --git a/src/commands/container/pull.ts b/src/commands/container/pull.ts
index 81d6a1db95..bee2b46a0c 100644
--- a/src/commands/container/pull.ts
+++ b/src/commands/container/pull.ts
@@ -3,7 +3,7 @@ import {Command, flags} from '@heroku-cli/command'
 import * as Heroku from '@heroku-cli/schema'
 
 import {debug} from '../../lib/container/debug.js'
-import {DockerHelper} from '../../lib/container/docker_helper.js'
+import {DockerHelper} from '../../lib/container/docker-helper.js'
 import {ensureContainerStack} from '../../lib/container/helpers.js'
 
 export default class Pull extends Command {
diff --git a/src/commands/container/push.ts b/src/commands/container/push.ts
index 9d42056d0d..884bf72643 100644
--- a/src/commands/container/push.ts
+++ b/src/commands/container/push.ts
@@ -4,7 +4,7 @@ import {color, hux} from '@heroku/heroku-cli-util'
 import {ux} from '@oclif/core/ux'
 
 import {debug} from '../../lib/container/debug.js'
-import {DockerHelper, DockerJob, GroupedDockerJobs} from '../../lib/container/docker_helper.js'
+import {DockerHelper, DockerJob, GroupedDockerJobs} from '../../lib/container/docker-helper.js'
 import {ensureContainerStack} from '../../lib/container/helpers.js'
 
 export default class Push extends Command {
diff --git a/src/commands/container/run.ts b/src/commands/container/run.ts
index 2e8689fabc..2fa5b971b9 100644
--- a/src/commands/container/run.ts
+++ b/src/commands/container/run.ts
@@ -4,7 +4,7 @@ import {color, hux} from '@heroku/heroku-cli-util'
 import {ux} from '@oclif/core/ux'
 
 import {debug} from '../../lib/container/debug.js'
-import {DockerHelper, DockerJob} from '../../lib/container/docker_helper.js'
+import {DockerHelper, DockerJob} from '../../lib/container/docker-helper.js'
 import {ensureContainerStack} from '../../lib/container/helpers.js'
 
 export default class Run extends Command {
diff --git a/src/commands/dashboard.ts b/src/commands/dashboard.ts
index 67a844320f..3a8b64d9e2 100644
--- a/src/commands/dashboard.ts
+++ b/src/commands/dashboard.ts
@@ -10,7 +10,7 @@ import {fileURLToPath} from 'url'
 
 import {lazyModuleLoader} from '../lib/lazy-module-loader.js'
 import {ago} from '../lib/time.js'
-import {AppErrors} from '../lib/types/app_errors.js'
+import {AppErrors} from '../lib/types/app-errors.js'
 import {sparkline} from '../lib/utils/sparkline.js'
 
 const __filename = fileURLToPath(import.meta.url)
diff --git a/src/commands/data/maintenances/history.ts b/src/commands/data/maintenances/history.ts
index fa1d6f82c9..42686e61f6 100644
--- a/src/commands/data/maintenances/history.ts
+++ b/src/commands/data/maintenances/history.ts
@@ -2,9 +2,9 @@ import {color, hux, utils} from '@heroku/heroku-cli-util'
 import {flags as Flags} from '@heroku-cli/command'
 import {Args, ux} from '@oclif/core'
 
-import BaseCommand from '../../../lib/data/baseCommand.js'
+import BaseCommand from '../../../lib/data/base-command.js'
 import {Maintenance} from '../../../lib/data/types.js'
-import {constructSortFilterTableOptions, constructTableColumns, outputCSV} from '../../../lib/utils/tableUtils.js'
+import {constructSortFilterTableOptions, constructTableColumns, outputCSV} from '../../../lib/utils/table-utils.js'
 
 export default class DataMaintenancesHistory extends BaseCommand {
   static args = {
diff --git a/src/commands/data/maintenances/index.ts b/src/commands/data/maintenances/index.ts
index 81fbf385f4..58fbd068ac 100644
--- a/src/commands/data/maintenances/index.ts
+++ b/src/commands/data/maintenances/index.ts
@@ -3,9 +3,9 @@ import * as Heroku from '@heroku-cli/schema'
 import {hux} from '@heroku/heroku-cli-util'
 import {ux} from '@oclif/core/ux'
 
-import BaseCommand from '../../../lib/data/baseCommand.js'
+import BaseCommand from '../../../lib/data/base-command.js'
 import {Maintenance, MaintenanceStatus} from '../../../lib/data/types.js'
-import {constructSortFilterTableOptions, constructTableColumns, outputCSV} from '../../../lib/utils/tableUtils.js'
+import {constructSortFilterTableOptions, constructTableColumns, outputCSV} from '../../../lib/utils/table-utils.js'
 
 export default class DataMaintenancesIndex extends BaseCommand {
   static description = 'list maintenances for an app\'s data addons'
diff --git a/src/commands/data/maintenances/info.ts b/src/commands/data/maintenances/info.ts
index bd1a10a304..6484626800 100644
--- a/src/commands/data/maintenances/info.ts
+++ b/src/commands/data/maintenances/info.ts
@@ -2,7 +2,7 @@ import {color, hux, utils} from '@heroku/heroku-cli-util'
 import {flags} from '@heroku-cli/command'
 import {Args, ux} from '@oclif/core'
 
-import BaseCommand from '../../../lib/data/baseCommand.js'
+import BaseCommand from '../../../lib/data/base-command.js'
 import {lazyModuleLoader} from '../../../lib/lazy-module-loader.js'
 import {Maintenance} from '../../../lib/data/types.js'
 
diff --git a/src/commands/data/maintenances/run.ts b/src/commands/data/maintenances/run.ts
index 165b6cbdc3..ffcc707c28 100644
--- a/src/commands/data/maintenances/run.ts
+++ b/src/commands/data/maintenances/run.ts
@@ -3,7 +3,7 @@ import * as Heroku from '@heroku-cli/schema'
 import {color, utils} from '@heroku/heroku-cli-util'
 import {Args, ux} from '@oclif/core'
 
-import BaseCommand from '../../../lib/data/baseCommand.js'
+import BaseCommand from '../../../lib/data/base-command.js'
 import {waitUntilMaintenanceComplete} from '../../../lib/data/utils.js'
 
 export default class DataMaintenancesRun extends BaseCommand {
diff --git a/src/commands/data/maintenances/schedule.ts b/src/commands/data/maintenances/schedule.ts
index da2e18173a..e3bde8b9d6 100644
--- a/src/commands/data/maintenances/schedule.ts
+++ b/src/commands/data/maintenances/schedule.ts
@@ -3,7 +3,7 @@ import {flags} from '@heroku-cli/command'
 import * as Heroku from '@heroku-cli/schema'
 import {Args, ux} from '@oclif/core'
 
-import BaseCommand from '../../../lib/data/baseCommand.js'
+import BaseCommand from '../../../lib/data/base-command.js'
 import {lazyModuleLoader} from '../../../lib/lazy-module-loader.js'
 import {Maintenance} from '../../../lib/data/types.js'
 
diff --git a/src/commands/data/maintenances/wait.ts b/src/commands/data/maintenances/wait.ts
index e870960092..9aca06b295 100644
--- a/src/commands/data/maintenances/wait.ts
+++ b/src/commands/data/maintenances/wait.ts
@@ -2,7 +2,7 @@ import {color, utils} from '@heroku/heroku-cli-util'
 import {flags as Flags} from '@heroku-cli/command'
 import {Args, ux} from '@oclif/core'
 
-import BaseCommand from '../../../lib/data/baseCommand.js'
+import BaseCommand from '../../../lib/data/base-command.js'
 import {Maintenance, MaintenanceStatus} from '../../../lib/data/types.js'
 import {waitUntilMaintenanceComplete} from '../../../lib/data/utils.js'
 
diff --git a/src/commands/data/maintenances/window/index.ts b/src/commands/data/maintenances/window/index.ts
index 402588ebca..f145f62dee 100644
--- a/src/commands/data/maintenances/window/index.ts
+++ b/src/commands/data/maintenances/window/index.ts
@@ -2,7 +2,7 @@ import {color, hux, utils} from '@heroku/heroku-cli-util'
 import {flags as Flags} from '@heroku-cli/command'
 import {Args, ux} from '@oclif/core'
 
-import BaseCommand from '../../../../lib/data/baseCommand.js'
+import BaseCommand from '../../../../lib/data/base-command.js'
 import {Window} from '../../../../lib/data/types.js'
 
 export default class DataMaintenancesWindow extends BaseCommand {
diff --git a/src/commands/data/maintenances/window/update.ts b/src/commands/data/maintenances/window/update.ts
index bb4d989da2..b27c3d09c3 100644
--- a/src/commands/data/maintenances/window/update.ts
+++ b/src/commands/data/maintenances/window/update.ts
@@ -2,7 +2,7 @@ import {color, hux, utils} from '@heroku/heroku-cli-util'
 import {flags as Flags} from '@heroku-cli/command'
 import {Args, ux} from '@oclif/core'
 
-import BaseCommand from '../../../../lib/data/baseCommand.js'
+import BaseCommand from '../../../../lib/data/base-command.js'
 import {Window} from '../../../../lib/data/types.js'
 
 export default class DataMaintenancesWindowUpdate extends BaseCommand {
diff --git a/src/commands/data/pg/attachments/create.ts b/src/commands/data/pg/attachments/create.ts
index 16a4c37638..641cd40e0d 100644
--- a/src/commands/data/pg/attachments/create.ts
+++ b/src/commands/data/pg/attachments/create.ts
@@ -5,7 +5,7 @@ import {Args, ux} from '@oclif/core'
 import tsheredoc from 'tsheredoc'
 
 import {trapConfirmationRequired} from '../../../../lib/addons/util.js'
-import BaseCommand from '../../../../lib/data/baseCommand.js'
+import BaseCommand from '../../../../lib/data/base-command.js'
 
 const heredoc = tsheredoc.default
 
diff --git a/src/commands/data/pg/attachments/destroy.ts b/src/commands/data/pg/attachments/destroy.ts
index 1f8bdc4797..6a1b38dbcc 100644
--- a/src/commands/data/pg/attachments/destroy.ts
+++ b/src/commands/data/pg/attachments/destroy.ts
@@ -3,7 +3,7 @@ import {flags as Flags} from '@heroku-cli/command'
 import * as Heroku from '@heroku-cli/schema'
 import {Args, ux} from '@oclif/core'
 
-import BaseCommand from '../../../../lib/data/baseCommand.js'
+import BaseCommand from '../../../../lib/data/base-command.js'
 
 export default class DataPgAttachmentsDestroy extends BaseCommand {
   static args = {
diff --git a/src/commands/data/pg/attachments/index.ts b/src/commands/data/pg/attachments/index.ts
index 48724320c9..a012ee02aa 100644
--- a/src/commands/data/pg/attachments/index.ts
+++ b/src/commands/data/pg/attachments/index.ts
@@ -5,7 +5,7 @@ import {Args, ux} from '@oclif/core'
 
 import type {CredentialInfo, CredentialsInfo} from '../../../../lib/data/types.js'
 
-import BaseCommand from '../../../../lib/data/baseCommand.js'
+import BaseCommand from '../../../../lib/data/base-command.js'
 
 export default class DataPgAttachmentsIndex extends BaseCommand {
   static args = {
diff --git a/src/commands/data/pg/create.ts b/src/commands/data/pg/create.ts
index 26575a8ff8..bc4b368f1f 100644
--- a/src/commands/data/pg/create.ts
+++ b/src/commands/data/pg/create.ts
@@ -5,11 +5,11 @@ import {ux} from '@oclif/core/ux'
 import inquirer from 'inquirer'
 import tsheredoc from 'tsheredoc'
 
-import createAddon from '../../../lib/addons/create_addon.js'
-import BaseCommand from '../../../lib/data/baseCommand.js'
-import createPool from '../../../lib/data/createPool.js'
-import {parseProvisionOpts} from '../../../lib/data/parseProvisionOpts.js'
-import PoolConfig from '../../../lib/data/poolConfig.js'
+import createAddon from '../../../lib/addons/create-addon.js'
+import BaseCommand from '../../../lib/data/base-command.js'
+import createPool from '../../../lib/data/create-pool.js'
+import {parseProvisionOpts} from '../../../lib/data/parse-provision-opts.js'
+import PoolConfig from '../../../lib/data/pool-config.js'
 import {ExtendedPostgresLevelInfo} from '../../../lib/data/types.js'
 import {fetchLevelsAndPricing, renderPricingInfo} from '../../../lib/data/utils.js'
 import notify from '../../../lib/notify.js'
diff --git a/src/commands/data/pg/credentials/create.ts b/src/commands/data/pg/credentials/create.ts
index 3cf7fac9ac..b9011201c0 100644
--- a/src/commands/data/pg/credentials/create.ts
+++ b/src/commands/data/pg/credentials/create.ts
@@ -3,7 +3,7 @@ import {color, utils} from '@heroku/heroku-cli-util'
 import {Args, ux} from '@oclif/core'
 import tsheredoc from 'tsheredoc'
 
-import BaseCommand from '../../../../lib/data/baseCommand.js'
+import BaseCommand from '../../../../lib/data/base-command.js'
 
 const heredoc = tsheredoc.default
 
diff --git a/src/commands/data/pg/credentials/destroy.ts b/src/commands/data/pg/credentials/destroy.ts
index 34054a184e..c3dcc089c5 100644
--- a/src/commands/data/pg/credentials/destroy.ts
+++ b/src/commands/data/pg/credentials/destroy.ts
@@ -9,7 +9,7 @@ import {Args, ux} from '@oclif/core'
 
 import type {CredentialInfo, CredentialsInfo} from '../../../../lib/data/types.js'
 
-import BaseCommand from '../../../../lib/data/baseCommand.js'
+import BaseCommand from '../../../../lib/data/base-command.js'
 
 export default class DataPgCredentialsDestroy extends BaseCommand {
   static args = {
diff --git a/src/commands/data/pg/credentials/index.ts b/src/commands/data/pg/credentials/index.ts
index bff6677b30..7ed861f42a 100644
--- a/src/commands/data/pg/credentials/index.ts
+++ b/src/commands/data/pg/credentials/index.ts
@@ -5,10 +5,10 @@ import {Args, ux} from '@oclif/core'
 
 import type {CredentialInfo, CredentialsInfo} from '../../../../lib/data/types.js'
 
-import BaseCommand from '../../../../lib/data/baseCommand.js'
-import {sortByOwnerAndName} from '../../../../lib/data/credentialUtils.js'
+import BaseCommand from '../../../../lib/data/base-command.js'
+import {sortByOwnerAndName} from '../../../../lib/data/credential-utils.js'
 import {presentCredentialAttachments} from '../../../../lib/pg/util.js'
-import {huxTableNoWrapOptions} from '../../../../lib/utils/tableUtils.js'
+import {huxTableNoWrapOptions} from '../../../../lib/utils/table-utils.js'
 
 export default class DataPgCredentialsIndex extends BaseCommand {
   static args = {
diff --git a/src/commands/data/pg/credentials/rotate.ts b/src/commands/data/pg/credentials/rotate.ts
index 13fe357a7e..f42ed3d46e 100644
--- a/src/commands/data/pg/credentials/rotate.ts
+++ b/src/commands/data/pg/credentials/rotate.ts
@@ -5,7 +5,7 @@ import {Args, ux} from '@oclif/core'
 
 import type {CredentialInfo, CredentialsInfo, NonAdvancedCredentialInfo} from '../../../../lib/data/types.js'
 
-import BaseCommand from '../../../../lib/data/baseCommand.js'
+import BaseCommand from '../../../../lib/data/base-command.js'
 
 export default class Rotate extends BaseCommand {
   static args = {
diff --git a/src/commands/data/pg/credentials/url.ts b/src/commands/data/pg/credentials/url.ts
index 2210889ac6..8c10987ea4 100644
--- a/src/commands/data/pg/credentials/url.ts
+++ b/src/commands/data/pg/credentials/url.ts
@@ -11,7 +11,7 @@ import type {
   NonAdvancedCredentialInfo,
 } from '../../../../lib/data/types.js'
 
-import BaseCommand from '../../../../lib/data/baseCommand.js'
+import BaseCommand from '../../../../lib/data/base-command.js'
 import {isAdvancedCredentialInfo} from '../../../../lib/data/types.js'
 
 const heredoc = tsheredoc.default
diff --git a/src/commands/data/pg/destroy.ts b/src/commands/data/pg/destroy.ts
index 3b46b0608b..1a827864cc 100644
--- a/src/commands/data/pg/destroy.ts
+++ b/src/commands/data/pg/destroy.ts
@@ -2,8 +2,8 @@ import {color, hux, utils} from '@heroku/heroku-cli-util'
 import {flags as Flags} from '@heroku-cli/command'
 import {Args, ux} from '@oclif/core'
 
-import destroyAddon from '../../../lib/addons/destroy_addon.js'
-import BaseCommand from '../../../lib/data/baseCommand.js'
+import destroyAddon from '../../../lib/addons/destroy-addon.js'
+import BaseCommand from '../../../lib/data/base-command.js'
 
 export default class DataPgDestroy extends BaseCommand {
   static args = {
diff --git a/src/commands/data/pg/docs.ts b/src/commands/data/pg/docs.ts
index 1d010cf049..94d6ab21e4 100644
--- a/src/commands/data/pg/docs.ts
+++ b/src/commands/data/pg/docs.ts
@@ -1,7 +1,7 @@
 import {hux} from '@heroku/heroku-cli-util'
 import {flags} from '@heroku-cli/command'
 
-import BaseCommand from '../../../lib/data/baseCommand.js'
+import BaseCommand from '../../../lib/data/base-command.js'
 
 export default class DataPgDocs extends BaseCommand {
   static defaultUrl = 'https://devcenter.heroku.com/categories/heroku-postgres'
diff --git a/src/commands/data/pg/fork.ts b/src/commands/data/pg/fork.ts
index ad75370c81..675ea5fc02 100644
--- a/src/commands/data/pg/fork.ts
+++ b/src/commands/data/pg/fork.ts
@@ -3,10 +3,10 @@ import {flags as Flags} from '@heroku-cli/command'
 import {Args, ux} from '@oclif/core'
 import tsheredoc from 'tsheredoc'
 
-import createAddon from '../../../lib/addons/create_addon.js'
-import BaseCommand from '../../../lib/data/baseCommand.js'
+import createAddon from '../../../lib/addons/create-addon.js'
+import BaseCommand from '../../../lib/data/base-command.js'
 import {lazyModuleLoader} from '../../../lib/lazy-module-loader.js'
-import {parseProvisionOpts} from '../../../lib/data/parseProvisionOpts.js'
+import {parseProvisionOpts} from '../../../lib/data/parse-provision-opts.js'
 import {InfoResponse} from '../../../lib/data/types.js'
 import notify from '../../../lib/notify.js'
 
diff --git a/src/commands/data/pg/info.ts b/src/commands/data/pg/info.ts
index 3ca8116801..1409a08f57 100644
--- a/src/commands/data/pg/info.ts
+++ b/src/commands/data/pg/info.ts
@@ -4,8 +4,8 @@ import {color, hux, utils} from '@heroku/heroku-cli-util'
 import {Args, ux} from '@oclif/core'
 import tsheredoc from 'tsheredoc'
 
-import BaseCommand from '../../../lib/data/baseCommand.js'
-import {formatQuotaStatus} from '../../../lib/data/displayQuota.js'
+import BaseCommand from '../../../lib/data/base-command.js'
+import {formatQuotaStatus} from '../../../lib/data/display-quota.js'
 import {InfoResponse, PoolInfoResponse, Quota} from '../../../lib/data/types.js'
 
 const heredoc = tsheredoc.default
diff --git a/src/commands/data/pg/levels.ts b/src/commands/data/pg/levels.ts
index c959aebb62..5049c2e6ab 100644
--- a/src/commands/data/pg/levels.ts
+++ b/src/commands/data/pg/levels.ts
@@ -2,7 +2,7 @@ import {Command} from '@heroku-cli/command'
 import {hux} from '@heroku/heroku-cli-util'
 import {printTable, TableOptions} from '@oclif/table'
 
-import BaseCommand from '../../../lib/data/baseCommand.js'
+import BaseCommand from '../../../lib/data/base-command.js'
 import {PostgresLevelInfo, PostgresLevelsResponse} from '../../../lib/data/types.js'
 
 export default class DataPgLevels extends BaseCommand {
diff --git a/src/commands/data/pg/quotas/index.ts b/src/commands/data/pg/quotas/index.ts
index bf1e8936d7..66533bd090 100644
--- a/src/commands/data/pg/quotas/index.ts
+++ b/src/commands/data/pg/quotas/index.ts
@@ -4,8 +4,8 @@ import {Args, ux} from '@oclif/core'
 
 import type {Quota, Quotas} from '../../../../lib/data/types.js'
 
-import BaseCommand from '../../../../lib/data/baseCommand.js'
-import {displayQuota} from '../../../../lib/data/displayQuota.js'
+import BaseCommand from '../../../../lib/data/base-command.js'
+import {displayQuota} from '../../../../lib/data/display-quota.js'
 
 export default class DataPgQuotasIndex extends BaseCommand {
   static args = {
diff --git a/src/commands/data/pg/quotas/update.ts b/src/commands/data/pg/quotas/update.ts
index 3bfbc2a46d..78cd03687c 100644
--- a/src/commands/data/pg/quotas/update.ts
+++ b/src/commands/data/pg/quotas/update.ts
@@ -5,8 +5,8 @@ import tsheredoc from 'tsheredoc'
 
 import type {Quota} from '../../../../lib/data/types.js'
 
-import BaseCommand from '../../../../lib/data/baseCommand.js'
-import {displayQuota} from '../../../../lib/data/displayQuota.js'
+import BaseCommand from '../../../../lib/data/base-command.js'
+import {displayQuota} from '../../../../lib/data/display-quota.js'
 
 type QuotaUpdate = {
   critical_gb?: null | number,
diff --git a/src/commands/data/pg/settings.ts b/src/commands/data/pg/settings.ts
index 9764d23568..48273d2e7e 100644
--- a/src/commands/data/pg/settings.ts
+++ b/src/commands/data/pg/settings.ts
@@ -3,7 +3,7 @@ import {color, hux, utils} from '@heroku/heroku-cli-util'
 import {Args, ux} from '@oclif/core'
 import tsheredoc from 'tsheredoc'
 
-import BaseCommand from '../../../lib/data/baseCommand.js'
+import BaseCommand from '../../../lib/data/base-command.js'
 import {SettingsChangeResponse, SettingsResponse} from '../../../lib/data/types.js'
 
 const heredoc = tsheredoc.default
diff --git a/src/commands/data/pg/update.ts b/src/commands/data/pg/update.ts
index 9e2d136fbd..2ceb701a7d 100644
--- a/src/commands/data/pg/update.ts
+++ b/src/commands/data/pg/update.ts
@@ -9,9 +9,9 @@ import {Args, ux} from '@oclif/core'
 import inquirer from 'inquirer'
 import tsheredoc from 'tsheredoc'
 
-import BaseCommand from '../../../lib/data/baseCommand.js'
-import createPool from '../../../lib/data/createPool.js'
-import PoolConfig from '../../../lib/data/poolConfig.js'
+import BaseCommand from '../../../lib/data/base-command.js'
+import createPool from '../../../lib/data/create-pool.js'
+import PoolConfig from '../../../lib/data/pool-config.js'
 import {
   DeepRequired,
   ExtendedPostgresLevelInfo,
diff --git a/src/commands/data/pg/upgrade/run.ts b/src/commands/data/pg/upgrade/run.ts
index bc93ff5ac4..7833c6d017 100644
--- a/src/commands/data/pg/upgrade/run.ts
+++ b/src/commands/data/pg/upgrade/run.ts
@@ -3,7 +3,7 @@ import {color, hux, utils} from '@heroku/heroku-cli-util'
 import {Args, ux} from '@oclif/core'
 import tsheredoc from 'tsheredoc'
 
-import BaseCommand from '../../../../lib/data/baseCommand.js'
+import BaseCommand from '../../../../lib/data/base-command.js'
 import {InfoResponse, UpgradeResponse} from '../../../../lib/data/types.js'
 
 const heredoc = tsheredoc.default
diff --git a/src/commands/data/pg/wait.ts b/src/commands/data/pg/wait.ts
index 71d4be8b11..47fb86cb03 100644
--- a/src/commands/data/pg/wait.ts
+++ b/src/commands/data/pg/wait.ts
@@ -7,7 +7,7 @@ import {HTTPError} from '@heroku/http-call'
 import {Args, ux} from '@oclif/core'
 import tsheredoc from 'tsheredoc'
 
-import BaseCommand from '../../../lib/data/baseCommand.js'
+import BaseCommand from '../../../lib/data/base-command.js'
 import {WaitStatus} from '../../../lib/data/types.js'
 import notify from '../../../lib/notify.js'
 
diff --git a/src/commands/domains/index.ts b/src/commands/domains/index.ts
index b96b5ec440..26d7a8dd4b 100644
--- a/src/commands/domains/index.ts
+++ b/src/commands/domains/index.ts
@@ -5,9 +5,9 @@ import {ux} from '@oclif/core/ux'
 import {orderBy} from 'natural-orderby'
 import Uri from 'urijs'
 
-import parseKeyValue from '../../lib/utils/keyValueParser.js'
+import parseKeyValue from '../../lib/utils/key-value-parser.js'
 import {paginateRequest} from '../../lib/utils/paginator.js'
-import {huxTableNoWrapOptions} from '../../lib/utils/tableUtils.js'
+import {huxTableNoWrapOptions} from '../../lib/utils/table-utils.js'
 
 export default class DomainsIndex extends Command {
   static description = 'list domains for an app'
diff --git a/src/commands/pg/backups/delete.ts b/src/commands/pg/backups/delete.ts
index 7dff1f1d4d..98a3ce608c 100644
--- a/src/commands/pg/backups/delete.ts
+++ b/src/commands/pg/backups/delete.ts
@@ -2,7 +2,7 @@ import {color, utils} from '@heroku/heroku-cli-util'
 import {Command, flags} from '@heroku-cli/command'
 import {Args, ux} from '@oclif/core'
 
-import ConfirmCommand from '../../../lib/confirmCommand.js'
+import ConfirmCommand from '../../../lib/confirm-command.js'
 import backupsFactory from '../../../lib/pg/backups.js'
 
 export default class Delete extends Command {
diff --git a/src/commands/pg/backups/restore.ts b/src/commands/pg/backups/restore.ts
index 83f6bed085..efcfedfb63 100644
--- a/src/commands/pg/backups/restore.ts
+++ b/src/commands/pg/backups/restore.ts
@@ -5,7 +5,7 @@ import tsheredoc from 'tsheredoc'
 
 import type {BackupTransfer} from '../../../lib/pg/types.js'
 
-import ConfirmCommand from '../../../lib/confirmCommand.js'
+import ConfirmCommand from '../../../lib/confirm-command.js'
 import backupsFactory from '../../../lib/pg/backups.js'
 import {nls} from '../../../nls.js'
 
diff --git a/src/commands/pg/copy.ts b/src/commands/pg/copy.ts
index 2464107d9d..bfcc0508b5 100644
--- a/src/commands/pg/copy.ts
+++ b/src/commands/pg/copy.ts
@@ -6,7 +6,7 @@ import {Args, ux} from '@oclif/core'
 import type {NonAdvancedCredentialInfo} from '../../lib/data/types.js'
 import type {BackupTransfer} from '../../lib/pg/types.js'
 
-import ConfirmCommand from '../../lib/confirmCommand.js'
+import ConfirmCommand from '../../lib/confirm-command.js'
 import backupsFactory from '../../lib/pg/backups.js'
 
 const getAttachmentInfo = async function (heroku: APIClient, db: string, app: string) {
diff --git a/src/commands/pg/credentials.ts b/src/commands/pg/credentials.ts
index 79400709dd..67bb15fa20 100644
--- a/src/commands/pg/credentials.ts
+++ b/src/commands/pg/credentials.ts
@@ -6,7 +6,7 @@ import {Args} from '@oclif/core'
 import type {NonAdvancedCredentialInfo} from '../../lib/data/types.js'
 
 import {presentCredentialAttachments} from '../../lib/pg/util.js'
-import {huxTableNoWrapOptions} from '../../lib/utils/tableUtils.js'
+import {huxTableNoWrapOptions} from '../../lib/utils/table-utils.js'
 import {nls} from '../../nls.js'
 
 export default class Credentials extends Command {
diff --git a/src/commands/pg/credentials/destroy.ts b/src/commands/pg/credentials/destroy.ts
index 1630b1bf5c..5e416f53df 100644
--- a/src/commands/pg/credentials/destroy.ts
+++ b/src/commands/pg/credentials/destroy.ts
@@ -3,7 +3,7 @@ import * as Heroku from '@heroku-cli/schema'
 import {color, utils} from '@heroku/heroku-cli-util'
 import {Args, ux} from '@oclif/core'
 
-import ConfirmCommand from '../../../lib/confirmCommand.js'
+import ConfirmCommand from '../../../lib/confirm-command.js'
 import {essentialPlan} from '../../../lib/pg/util.js'
 import {nls} from '../../../nls.js'
 
diff --git a/src/commands/pg/credentials/repair-default.ts b/src/commands/pg/credentials/repair-default.ts
index 95ec486e01..0a59afb58d 100644
--- a/src/commands/pg/credentials/repair-default.ts
+++ b/src/commands/pg/credentials/repair-default.ts
@@ -3,7 +3,7 @@ import {Command, flags} from '@heroku-cli/command'
 import {Args, ux} from '@oclif/core'
 import tsheredoc from 'tsheredoc'
 
-import ConfirmCommand from '../../../lib/confirmCommand.js'
+import ConfirmCommand from '../../../lib/confirm-command.js'
 import {essentialPlan} from '../../../lib/pg/util.js'
 import {nls} from '../../../nls.js'
 
diff --git a/src/commands/pg/credentials/rotate.ts b/src/commands/pg/credentials/rotate.ts
index 726e745a7f..9783fed1e6 100644
--- a/src/commands/pg/credentials/rotate.ts
+++ b/src/commands/pg/credentials/rotate.ts
@@ -4,7 +4,7 @@ import {APIClient, Command, flags} from '@heroku-cli/command'
 import {color, utils} from '@heroku/heroku-cli-util'
 import {Args, ux} from '@oclif/core'
 
-import ConfirmCommand from '../../../lib/confirmCommand.js'
+import ConfirmCommand from '../../../lib/confirm-command.js'
 import {nls} from '../../../nls.js'
 
 export default class Rotate extends Command {
diff --git a/src/commands/pg/links/destroy.ts b/src/commands/pg/links/destroy.ts
index 3be34efd9b..15ab6163f4 100644
--- a/src/commands/pg/links/destroy.ts
+++ b/src/commands/pg/links/destroy.ts
@@ -3,7 +3,7 @@ import {Command, flags} from '@heroku-cli/command'
 import {Args, ux} from '@oclif/core'
 import tsheredoc from 'tsheredoc'
 
-import ConfirmCommand from '../../../lib/confirmCommand.js'
+import ConfirmCommand from '../../../lib/confirm-command.js'
 import {essentialPlan} from '../../../lib/pg/util.js'
 const heredoc = tsheredoc.default
 import {nls} from '../../../nls.js'
diff --git a/src/commands/pg/pull.ts b/src/commands/pg/pull.ts
index db69ea97b8..d71f40f97f 100644
--- a/src/commands/pg/pull.ts
+++ b/src/commands/pg/pull.ts
@@ -12,7 +12,7 @@ import {
   prepare,
   spawnPipe,
   verifyExtensionsMatch,
-} from '../../lib/pg/push_pull.js'
+} from '../../lib/pg/push-pull.js'
 
 const {env} = process
 const heredoc = tsheredoc.default
diff --git a/src/commands/pg/push.ts b/src/commands/pg/push.ts
index ee7a23cf68..780dc83de6 100644
--- a/src/commands/pg/push.ts
+++ b/src/commands/pg/push.ts
@@ -9,7 +9,7 @@ import {
   prepare,
   spawnPipe,
   verifyExtensionsMatch,
-} from '../../lib/pg/push_pull.js'
+} from '../../lib/pg/push-pull.js'
 import childProcess from 'node:child_process'
 import {nls} from '../../nls.js'
 
diff --git a/src/commands/pg/reset.ts b/src/commands/pg/reset.ts
index 3bcd221e3f..9dde08f63f 100644
--- a/src/commands/pg/reset.ts
+++ b/src/commands/pg/reset.ts
@@ -3,7 +3,7 @@ import {Command, flags} from '@heroku-cli/command'
 import {Args, ux} from '@oclif/core'
 import tsheredoc from 'tsheredoc'
 
-import ConfirmCommand from '../../lib/confirmCommand.js'
+import ConfirmCommand from '../../lib/confirm-command.js'
 import {nls} from '../../nls.js'
 
 const heredoc = tsheredoc.default
diff --git a/src/commands/pg/unfollow.ts b/src/commands/pg/unfollow.ts
index eeae62753d..a8bd23d0e0 100644
--- a/src/commands/pg/unfollow.ts
+++ b/src/commands/pg/unfollow.ts
@@ -3,7 +3,7 @@ import {Args, ux} from '@oclif/core'
 import * as Heroku from '@heroku-cli/schema'
 import {utils, color} from '@heroku/heroku-cli-util'
 import {databaseNameFromUrl} from '../../lib/pg/util.js'
-import ConfirmCommand from '../../lib/confirmCommand.js'
+import ConfirmCommand from '../../lib/confirm-command.js'
 import {PgDatabase} from '../../lib/pg/types.js'
 import tsheredoc from 'tsheredoc'
 import {nls} from '../../nls.js'
diff --git a/src/commands/pg/upgrade/cancel.ts b/src/commands/pg/upgrade/cancel.ts
index 93eec75bed..cf7f3b5236 100644
--- a/src/commands/pg/upgrade/cancel.ts
+++ b/src/commands/pg/upgrade/cancel.ts
@@ -3,7 +3,7 @@ import {Command, flags} from '@heroku-cli/command'
 import {Args, ux} from '@oclif/core'
 import tsheredoc from 'tsheredoc'
 
-import ConfirmCommand from '../../../lib/confirmCommand.js'
+import ConfirmCommand from '../../../lib/confirm-command.js'
 import {PgDatabase, PgUpgradeError, PgUpgradeResponse} from '../../../lib/pg/types.js'
 import {formatResponseWithCommands} from '../../../lib/pg/util.js'
 import {nls} from '../../../nls.js'
diff --git a/src/commands/pg/upgrade/dryrun.ts b/src/commands/pg/upgrade/dryrun.ts
index 093a88edfc..21152d44e9 100644
--- a/src/commands/pg/upgrade/dryrun.ts
+++ b/src/commands/pg/upgrade/dryrun.ts
@@ -3,7 +3,7 @@ import {Command, flags} from '@heroku-cli/command'
 import {Args, ux} from '@oclif/core'
 import tsheredoc from 'tsheredoc'
 
-import ConfirmCommand from '../../../lib/confirmCommand.js'
+import ConfirmCommand from '../../../lib/confirm-command.js'
 import {PgDatabase, PgUpgradeError, PgUpgradeResponse} from '../../../lib/pg/types.js'
 import {formatResponseWithCommands} from '../../../lib/pg/util.js'
 import {nls} from '../../../nls.js'
diff --git a/src/commands/pg/upgrade/prepare.ts b/src/commands/pg/upgrade/prepare.ts
index 41ecbd12a5..7d02269110 100644
--- a/src/commands/pg/upgrade/prepare.ts
+++ b/src/commands/pg/upgrade/prepare.ts
@@ -3,7 +3,7 @@ import {Command, flags} from '@heroku-cli/command'
 import {Args, ux} from '@oclif/core'
 import tsheredoc from 'tsheredoc'
 
-import ConfirmCommand from '../../../lib/confirmCommand.js'
+import ConfirmCommand from '../../../lib/confirm-command.js'
 import {PgDatabase, PgUpgradeError, PgUpgradeResponse} from '../../../lib/pg/types.js'
 import {formatResponseWithCommands} from '../../../lib/pg/util.js'
 import {nls} from '../../../nls.js'
diff --git a/src/commands/pg/upgrade/run.ts b/src/commands/pg/upgrade/run.ts
index 36fc98d7f0..1e932bf88f 100644
--- a/src/commands/pg/upgrade/run.ts
+++ b/src/commands/pg/upgrade/run.ts
@@ -4,7 +4,7 @@ import * as Heroku from '@heroku-cli/schema'
 import {Args, ux} from '@oclif/core'
 import tsheredoc from 'tsheredoc'
 
-import ConfirmCommand from '../../../lib/confirmCommand.js'
+import ConfirmCommand from '../../../lib/confirm-command.js'
 import {PgDatabase, PgUpgradeError, PgUpgradeResponse} from '../../../lib/pg/types.js'
 import {databaseNameFromUrl, formatResponseWithCommands} from '../../../lib/pg/util.js'
 import {nls} from '../../../nls.js'
diff --git a/src/commands/ps/index.ts b/src/commands/ps/index.ts
index 7db8042615..cee8217b5c 100644
--- a/src/commands/ps/index.ts
+++ b/src/commands/ps/index.ts
@@ -4,11 +4,11 @@ import {ux} from '@oclif/core/ux'
 import tsheredoc from 'tsheredoc'
 
 import {ago} from '../../lib/time.js'
-import {AccountQuota} from '../../lib/types/account_quota.js'
-import {AppProcessTier} from '../../lib/types/app_process_tier.js'
-import {DynoExtended} from '../../lib/types/dyno_extended.js'
+import {AccountQuota} from '../../lib/types/account-quota.js'
+import {AppProcessTier} from '../../lib/types/app-process-tier.js'
+import {DynoExtended} from '../../lib/types/dyno-extended.js'
 import {Account} from '../../lib/types/fir.js'
-import {huxTableNoWrapOptions} from '../../lib/utils/tableUtils.js'
+import {huxTableNoWrapOptions} from '../../lib/utils/table-utils.js'
 
 const heredoc = tsheredoc.default
 
diff --git a/src/commands/redis/cli.ts b/src/commands/redis/cli.ts
index 4a385149e4..f2b508aa1e 100644
--- a/src/commands/redis/cli.ts
+++ b/src/commands/redis/cli.ts
@@ -15,7 +15,7 @@ import * as tls from 'tls'
 
 import type {RedisFormationResponse} from '../../lib/redis/api.js'
 
-import ConfirmCommand from '../../lib/confirmCommand.js'
+import ConfirmCommand from '../../lib/confirm-command.js'
 import apiFactory from '../../lib/redis/api.js'
 
 const REPLY_OK = 'OK'
diff --git a/src/commands/redis/stats-reset.ts b/src/commands/redis/stats-reset.ts
index 24cc616f1e..01bd5497fd 100644
--- a/src/commands/redis/stats-reset.ts
+++ b/src/commands/redis/stats-reset.ts
@@ -3,7 +3,7 @@ import * as color from '@heroku/heroku-cli-util/color'
 import {Args, ux} from '@oclif/core'
 import tsheredoc from 'tsheredoc'
 
-import ConfirmCommand from '../../lib/confirmCommand.js'
+import ConfirmCommand from '../../lib/confirm-command.js'
 import redisApi, {RedisApiResponse} from '../../lib/redis/api.js'
 
 const heredoc = tsheredoc.default
diff --git a/src/commands/redis/upgrade.ts b/src/commands/redis/upgrade.ts
index 2666639159..d18c375ca0 100644
--- a/src/commands/redis/upgrade.ts
+++ b/src/commands/redis/upgrade.ts
@@ -3,7 +3,7 @@ import * as color from '@heroku/heroku-cli-util/color'
 import {Args, ux} from '@oclif/core'
 import tsheredoc from 'tsheredoc'
 
-import ConfirmCommand from '../../lib/confirmCommand.js'
+import ConfirmCommand from '../../lib/confirm-command.js'
 import redisApi, {RedisApiResponse} from '../../lib/redis/api.js'
 
 const heredoc = tsheredoc.default
diff --git a/src/commands/releases/index.ts b/src/commands/releases/index.ts
index d217b5ad46..88fcacbf4c 100644
--- a/src/commands/releases/index.ts
+++ b/src/commands/releases/index.ts
@@ -5,7 +5,7 @@ import {ux} from '@oclif/core/ux'
 import ansis from 'ansis'
 
 import {lazyModuleLoader} from '../../lib/lazy-module-loader.js'
-import * as statusHelper from '../../lib/releases/status_helper.js'
+import * as statusHelper from '../../lib/releases/status-helper.js'
 import * as time from '../../lib/time.js'
 
 type ColumnConfig = {
diff --git a/src/commands/releases/info.ts b/src/commands/releases/info.ts
index e8338f97f0..11f5ef94d1 100644
--- a/src/commands/releases/info.ts
+++ b/src/commands/releases/info.ts
@@ -5,7 +5,7 @@ import {Args, ux} from '@oclif/core'
 
 import {quote} from '../../lib/config/quote.js'
 import {findByLatestOrId} from '../../lib/releases/releases.js'
-import {description, color as getStatusColor} from '../../lib/releases/status_helper.js'
+import {description, color as getStatusColor} from '../../lib/releases/status-helper.js'
 
 export default class Info extends Command {
   static args = {
@@ -82,4 +82,3 @@ export default class Info extends Command {
     }
   }
 }
-
diff --git a/src/commands/spaces/destroy.ts b/src/commands/spaces/destroy.ts
index 597cb928c6..a7b4f74148 100644
--- a/src/commands/spaces/destroy.ts
+++ b/src/commands/spaces/destroy.ts
@@ -5,7 +5,7 @@ import {Args, ux} from '@oclif/core'
 import tsheredoc from 'tsheredoc'
 
 import {getGeneration} from '../../lib/apps/generation.js'
-import ConfirmCommand from '../../lib/confirmCommand.js'
+import ConfirmCommand from '../../lib/confirm-command.js'
 import {displayNat} from '../../lib/spaces/spaces.js'
 import {Space} from '../../lib/types/fir.js'
 
diff --git a/src/commands/spaces/peerings/destroy.ts b/src/commands/spaces/peerings/destroy.ts
index f4b5f248fa..38506a4c67 100644
--- a/src/commands/spaces/peerings/destroy.ts
+++ b/src/commands/spaces/peerings/destroy.ts
@@ -4,7 +4,7 @@ import {Command, flags} from '@heroku-cli/command'
 import {Args, ux} from '@oclif/core'
 import tsheredoc from 'tsheredoc'
 
-import ConfirmCommand from '../../../lib/confirmCommand.js'
+import ConfirmCommand from '../../../lib/confirm-command.js'
 
 const heredoc = tsheredoc.default
 
diff --git a/src/commands/spaces/vpn/destroy.ts b/src/commands/spaces/vpn/destroy.ts
index aab3d07769..3c0b8b6920 100644
--- a/src/commands/spaces/vpn/destroy.ts
+++ b/src/commands/spaces/vpn/destroy.ts
@@ -3,7 +3,7 @@ import * as color from '@heroku/heroku-cli-util/color'
 import {Args, ux} from '@oclif/core'
 import tsheredoc from 'tsheredoc'
 
-import ConfirmCommand from '../../../lib/confirmCommand.js'
+import ConfirmCommand from '../../../lib/confirm-command.js'
 
 const heredoc = tsheredoc.default
 
diff --git a/src/lib/addons/addons_wait.ts b/src/lib/addons/addons-wait.ts
similarity index 100%
rename from src/lib/addons/addons_wait.ts
rename to src/lib/addons/addons-wait.ts
diff --git a/src/lib/addons/create_addon.ts b/src/lib/addons/create-addon.ts
similarity index 97%
rename from src/lib/addons/create_addon.ts
rename to src/lib/addons/create-addon.ts
index 48dc03c2d8..c917fe39dd 100644
--- a/src/lib/addons/create_addon.ts
+++ b/src/lib/addons/create-addon.ts
@@ -3,7 +3,7 @@ import * as Heroku from '@heroku-cli/schema'
 import {color, utils} from '@heroku/heroku-cli-util'
 import {ux} from '@oclif/core/ux'
 
-import {waitForAddonProvisioning} from './addons_wait.js'
+import {waitForAddonProvisioning} from './addons-wait.js'
 import * as util from './util.js'
 
 function formatConfigVarsMessage(addon: Heroku.AddOn) {
diff --git a/src/lib/addons/destroy_addon.ts b/src/lib/addons/destroy-addon.ts
similarity index 97%
rename from src/lib/addons/destroy_addon.ts
rename to src/lib/addons/destroy-addon.ts
index e1db64f786..4d9a541da2 100644
--- a/src/lib/addons/destroy_addon.ts
+++ b/src/lib/addons/destroy-addon.ts
@@ -3,7 +3,7 @@ import * as Heroku from '@heroku-cli/schema'
 import {color, utils} from '@heroku/heroku-cli-util'
 import {ux} from '@oclif/core/ux'
 
-import {waitForAddonDeprovisioning} from './addons_wait.js'
+import {waitForAddonDeprovisioning} from './addons-wait.js'
 
 export default async function (heroku: APIClient, addon: Heroku.AddOn, force = false, wait = false) {
   const addonName = addon.name || ''
diff --git a/src/lib/addons/util.ts b/src/lib/addons/util.ts
index 5e93cf4e50..fdae906ef6 100644
--- a/src/lib/addons/util.ts
+++ b/src/lib/addons/util.ts
@@ -3,7 +3,7 @@ import * as color from '@heroku/heroku-cli-util/color'
 import {HTTPError} from '@heroku/http-call'
 import printf from 'printf'
 
-import ConfirmCommand from '../confirmCommand.js'
+import ConfirmCommand from '../confirm-command.js'
 
 export const trapConfirmationRequired = async <T> (app: string, confirm: string | undefined, fn: (confirmed?: string) => Promise<T>) => {
   try {
diff --git a/src/lib/apps/error_info.ts b/src/lib/apps/error-info.ts
similarity index 100%
rename from src/lib/apps/error_info.ts
rename to src/lib/apps/error-info.ts
diff --git a/src/lib/certs/certificate_details.ts b/src/lib/certs/certificate-details.ts
similarity index 93%
rename from src/lib/certs/certificate_details.ts
rename to src/lib/certs/certificate-details.ts
index c8683c8f67..4a074988ed 100644
--- a/src/lib/certs/certificate_details.ts
+++ b/src/lib/certs/certificate-details.ts
@@ -1,8 +1,8 @@
 import {color, hux} from '@heroku/heroku-cli-util'
 import {ux} from '@oclif/core/ux'
 
-import {SniEndpoint} from '../types/sni_endpoint.js'
-import formatDate from './format_date.js'
+import {SniEndpoint} from '../types/sni-endpoint.js'
+import formatDate from './format-date.js'
 
 export const displayCertificateDetails = function (sniEndpoint: SniEndpoint, message = 'Certificate details:') {
   const now = new Date()
diff --git a/src/lib/certs/display_table.ts b/src/lib/certs/display-table.ts
similarity index 94%
rename from src/lib/certs/display_table.ts
rename to src/lib/certs/display-table.ts
index 79e659d404..c29771138f 100644
--- a/src/lib/certs/display_table.ts
+++ b/src/lib/certs/display-table.ts
@@ -1,6 +1,6 @@
 import {hux} from '@heroku/heroku-cli-util'
-import formatDate from './format_date.js'
-import {SniEndpoint} from '../types/sni_endpoint.js'
+import formatDate from './format-date.js'
+import {SniEndpoint} from '../types/sni-endpoint.js'
 
 function type(endpoint: SniEndpoint) {
   if (endpoint.ssl_cert && endpoint.ssl_cert.acm) {
diff --git a/src/lib/certs/flags.ts b/src/lib/certs/flags.ts
index a1a9abc0d2..43587eaf87 100644
--- a/src/lib/certs/flags.ts
+++ b/src/lib/certs/flags.ts
@@ -2,7 +2,7 @@ import {HTTP} from '@heroku/http-call'
 import {APIClient} from '@heroku-cli/command'
 
 import {Domain} from '../types/domain.js'
-import {SniEndpoint} from '../types/sni_endpoint.js'
+import {SniEndpoint} from '../types/sni-endpoint.js'
 
 export default async function (flags: { app: string; endpoint: string | undefined; name: string | undefined }, heroku: APIClient) {
   if (flags.endpoint && flags.name) {
diff --git a/src/lib/certs/format_date.ts b/src/lib/certs/format-date.ts
similarity index 100%
rename from src/lib/certs/format_date.ts
rename to src/lib/certs/format-date.ts
diff --git a/src/lib/certs/get_cert_and_key.ts b/src/lib/certs/get-cert-and-key.ts
similarity index 100%
rename from src/lib/certs/get_cert_and_key.ts
rename to src/lib/certs/get-cert-and-key.ts
diff --git a/src/lib/confirmCommand.ts b/src/lib/confirm-command.ts
similarity index 100%
rename from src/lib/confirmCommand.ts
rename to src/lib/confirm-command.ts
diff --git a/src/lib/container/docker_helper.ts b/src/lib/container/docker-helper.ts
similarity index 100%
rename from src/lib/container/docker_helper.ts
rename to src/lib/container/docker-helper.ts
diff --git a/src/lib/data/baseCommand.ts b/src/lib/data/base-command.ts
similarity index 100%
rename from src/lib/data/baseCommand.ts
rename to src/lib/data/base-command.ts
diff --git a/src/lib/data/createPool.ts b/src/lib/data/create-pool.ts
similarity index 100%
rename from src/lib/data/createPool.ts
rename to src/lib/data/create-pool.ts
diff --git a/src/lib/data/credentialUtils.ts b/src/lib/data/credential-utils.ts
similarity index 100%
rename from src/lib/data/credentialUtils.ts
rename to src/lib/data/credential-utils.ts
diff --git a/src/lib/data/displayQuota.ts b/src/lib/data/display-quota.ts
similarity index 100%
rename from src/lib/data/displayQuota.ts
rename to src/lib/data/display-quota.ts
diff --git a/src/lib/data/parseProvisionOpts.ts b/src/lib/data/parse-provision-opts.ts
similarity index 100%
rename from src/lib/data/parseProvisionOpts.ts
rename to src/lib/data/parse-provision-opts.ts
diff --git a/src/lib/data/poolConfig.ts b/src/lib/data/pool-config.ts
similarity index 100%
rename from src/lib/data/poolConfig.ts
rename to src/lib/data/pool-config.ts
diff --git a/src/lib/pg/push_pull.ts b/src/lib/pg/push-pull.ts
similarity index 100%
rename from src/lib/pg/push_pull.ts
rename to src/lib/pg/push-pull.ts
diff --git a/src/lib/releases/status_helper.ts b/src/lib/releases/status-helper.ts
similarity index 100%
rename from src/lib/releases/status_helper.ts
rename to src/lib/releases/status-helper.ts
diff --git a/src/lib/teamUtils.ts b/src/lib/team-utils.ts
similarity index 100%
rename from src/lib/teamUtils.ts
rename to src/lib/team-utils.ts
diff --git a/src/lib/types/account_quota.d.ts b/src/lib/types/account-quota.d.ts
similarity index 100%
rename from src/lib/types/account_quota.d.ts
rename to src/lib/types/account-quota.d.ts
diff --git a/src/lib/types/app_errors.ts b/src/lib/types/app-errors.ts
similarity index 100%
rename from src/lib/types/app_errors.ts
rename to src/lib/types/app-errors.ts
diff --git a/src/lib/types/app_process_tier.ts b/src/lib/types/app-process-tier.ts
similarity index 100%
rename from src/lib/types/app_process_tier.ts
rename to src/lib/types/app-process-tier.ts
diff --git a/src/lib/types/dyno_extended.d.ts b/src/lib/types/dyno-extended.d.ts
similarity index 100%
rename from src/lib/types/dyno_extended.d.ts
rename to src/lib/types/dyno-extended.d.ts
diff --git a/src/lib/types/sni_endpoint.d.ts b/src/lib/types/sni-endpoint.d.ts
similarity index 100%
rename from src/lib/types/sni_endpoint.d.ts
rename to src/lib/types/sni-endpoint.d.ts
diff --git a/src/lib/utils/keyValueParser.ts b/src/lib/utils/key-value-parser.ts
similarity index 100%
rename from src/lib/utils/keyValueParser.ts
rename to src/lib/utils/key-value-parser.ts
diff --git a/src/lib/utils/tableUtils.ts b/src/lib/utils/table-utils.ts
similarity index 98%
rename from src/lib/utils/tableUtils.ts
rename to src/lib/utils/table-utils.ts
index 4a22e3eb6a..ab97a7b0ab 100644
--- a/src/lib/utils/tableUtils.ts
+++ b/src/lib/utils/table-utils.ts
@@ -1,6 +1,6 @@
 import {ux} from '@oclif/core/ux'
 
-import parseKeyValue from './keyValueParser.js'
+import parseKeyValue from './key-value-parser.js'
 
 export function huxTableNoWrapOptions(noWrap: boolean): {
   maxWidth: 'none' | undefined
diff --git a/test/helpers/stubs/sni-endpoints.ts b/test/helpers/stubs/sni-endpoints.ts
index 1088a03c86..91f88938a8 100644
--- a/test/helpers/stubs/sni-endpoints.ts
+++ b/test/helpers/stubs/sni-endpoints.ts
@@ -1,4 +1,4 @@
-import {SniEndpoint} from '../../../src/lib/types/sni_endpoint.js'
+import {SniEndpoint} from '../../../src/lib/types/sni-endpoint.js'
 import {Domain} from '../../../src/lib/types/domain.js'
 
 export const endpointStables: Pick<SniEndpoint, 'name' | 'domains' | 'ssl_cert'> = {
diff --git a/test/unit/commands/addons/attach.unit.test.ts b/test/unit/commands/addons/attach.unit.test.ts
index 1a5a743e5d..c6b6692742 100644
--- a/test/unit/commands/addons/attach.unit.test.ts
+++ b/test/unit/commands/addons/attach.unit.test.ts
@@ -4,7 +4,7 @@ import nock from 'nock'
 import sinon from 'sinon'
 
 import Cmd from '../../../../src/commands/addons/attach.js'
-import ConfirmCommand from '../../../../src/lib/confirmCommand.js'
+import ConfirmCommand from '../../../../src/lib/confirm-command.js'
 import {runCommand} from '../../../helpers/run-command.js'
 
 let confirmStub: sinon.SinonStub
diff --git a/test/unit/commands/certs/add.unit.test.ts b/test/unit/commands/certs/add.unit.test.ts
index 656b312876..0ed6dee58c 100644
--- a/test/unit/commands/certs/add.unit.test.ts
+++ b/test/unit/commands/certs/add.unit.test.ts
@@ -7,7 +7,7 @@ import tsheredoc from 'tsheredoc'
 import runCommand from '../../../helpers/runCommand.js'
 const heredoc = tsheredoc.default
 import Cmd from '../../../../src/commands/certs/add.js'
-import {CertAndKeyManager} from '../../../../src/lib/certs/get_cert_and_key.js'
+import {CertAndKeyManager} from '../../../../src/lib/certs/get-cert-and-key.js'
 import {
   certificateDetails,
   endpoint,
diff --git a/test/unit/commands/certs/info.unit.test.ts b/test/unit/commands/certs/info.unit.test.ts
index 5e8ffa2e1d..bceccaabf4 100644
--- a/test/unit/commands/certs/info.unit.test.ts
+++ b/test/unit/commands/certs/info.unit.test.ts
@@ -15,7 +15,7 @@ import {
   untrustedCertificateDetails,
 } from '../../../helpers/stubs/sni-endpoints.js'
 import * as sharedSni from './shared_sni.unit.test.js'
-import {SniEndpoint} from '../../../../src/lib/types/sni_endpoint.js'
+import {SniEndpoint} from '../../../../src/lib/types/sni-endpoint.js'
 
 const heredoc = tsheredoc.default
 
diff --git a/test/unit/commands/certs/remove.unit.test.ts b/test/unit/commands/certs/remove.unit.test.ts
index 2c7d8b4f2e..b69754df77 100644
--- a/test/unit/commands/certs/remove.unit.test.ts
+++ b/test/unit/commands/certs/remove.unit.test.ts
@@ -5,7 +5,7 @@ import {stderr, stdout} from 'stdout-stderr'
 import tsheredoc from 'tsheredoc'
 
 import Cmd from '../../../../src/commands/certs/remove.js'
-import {SniEndpoint} from '../../../../src/lib/types/sni_endpoint.js'
+import {SniEndpoint} from '../../../../src/lib/types/sni-endpoint.js'
 import runCommand from '../../../helpers/runCommand.js'
 import {endpoint} from '../../../helpers/stubs/sni-endpoints.js'
 import * as sharedSni from './shared_sni.unit.test.js'
diff --git a/test/unit/commands/certs/shared_sni.unit.test.ts b/test/unit/commands/certs/shared_sni.unit.test.ts
index 5171061630..e4b94dad9a 100644
--- a/test/unit/commands/certs/shared_sni.unit.test.ts
+++ b/test/unit/commands/certs/shared_sni.unit.test.ts
@@ -13,7 +13,7 @@ import {
   endpoint2Domain,
 } from '../../../helpers/stubs/sni-endpoints.js'
 import expectOutput from '../../../helpers/utils/expectOutput.js'
-import {SniEndpoint} from '../../../../src/lib/types/sni_endpoint.js'
+import {SniEndpoint} from '../../../../src/lib/types/sni-endpoint.js'
 import tsheredoc from 'tsheredoc'
 
 const heredoc = tsheredoc.default
diff --git a/test/unit/commands/certs/update.unit.test.ts b/test/unit/commands/certs/update.unit.test.ts
index 1868965062..030e6b40e3 100644
--- a/test/unit/commands/certs/update.unit.test.ts
+++ b/test/unit/commands/certs/update.unit.test.ts
@@ -8,8 +8,8 @@ import {stderr, stdout} from 'stdout-stderr'
 import tsheredoc from 'tsheredoc'
 
 import Cmd from '../../../../src/commands/certs/update.js'
-import {CertAndKeyManager} from '../../../../src/lib/certs/get_cert_and_key.js'
-import {SniEndpoint} from '../../../../src/lib/types/sni_endpoint.js'
+import {CertAndKeyManager} from '../../../../src/lib/certs/get-cert-and-key.js'
+import {SniEndpoint} from '../../../../src/lib/types/sni-endpoint.js'
 import runCommand from '../../../helpers/runCommand.js'
 import {certificateDetails, endpoint} from '../../../helpers/stubs/sni-endpoints.js'
 import * as sharedSni from './shared_sni.unit.test.js'
diff --git a/test/unit/commands/container/login.unit.test.ts b/test/unit/commands/container/login.unit.test.ts
index bc55c68763..6928f0cb8b 100644
--- a/test/unit/commands/container/login.unit.test.ts
+++ b/test/unit/commands/container/login.unit.test.ts
@@ -3,7 +3,7 @@ import Cmd from '../../../../src/commands/container/login.js'
 import runCommand from '../../../helpers/runCommand.js'
 import {expect} from 'chai'
 import sinon from 'sinon'
-import {DockerHelper} from '../../../../src/lib/container/docker_helper.js'
+import {DockerHelper} from '../../../../src/lib/container/docker-helper.js'
 
 describe('container:login', function () {
   let sandbox: sinon.SinonSandbox
diff --git a/test/unit/commands/container/logout.unit.test.ts b/test/unit/commands/container/logout.unit.test.ts
index aeffff65ec..5d6a9ef6a9 100644
--- a/test/unit/commands/container/logout.unit.test.ts
+++ b/test/unit/commands/container/logout.unit.test.ts
@@ -3,7 +3,7 @@ import Cmd from '../../../../src/commands/container/logout.js'
 import runCommand from '../../../helpers/runCommand.js'
 import {expect} from 'chai'
 import sinon from 'sinon'
-import {DockerHelper} from '../../../../src/lib/container/docker_helper.js'
+import {DockerHelper} from '../../../../src/lib/container/docker-helper.js'
 
 describe('container logout', function () {
   let sandbox: sinon.SinonSandbox
diff --git a/test/unit/commands/container/pull.unit.test.ts b/test/unit/commands/container/pull.unit.test.ts
index 26deeae596..c39d8a6533 100644
--- a/test/unit/commands/container/pull.unit.test.ts
+++ b/test/unit/commands/container/pull.unit.test.ts
@@ -3,7 +3,7 @@ import Cmd from '../../../../src/commands/container/pull.js'
 import runCommand from '../../../helpers/runCommand.js'
 import * as sinon from 'sinon'
 import {expect} from 'chai'
-import {DockerHelper} from '../../../../src/lib/container/docker_helper.js'
+import {DockerHelper} from '../../../../src/lib/container/docker-helper.js'
 import nock from 'nock'
 import {Errors} from '@oclif/core'
 
diff --git a/test/unit/commands/container/push.unit.test.ts b/test/unit/commands/container/push.unit.test.ts
index ede87ff555..cfdbe47a17 100644
--- a/test/unit/commands/container/push.unit.test.ts
+++ b/test/unit/commands/container/push.unit.test.ts
@@ -6,7 +6,7 @@ import * as sinon from 'sinon'
 import {stderr, stdout} from 'stdout-stderr'
 
 import Cmd from '../../../../src/commands/container/push.js'
-import {DockerHelper} from '../../../../src/lib/container/docker_helper.js'
+import {DockerHelper} from '../../../../src/lib/container/docker-helper.js'
 import runCommand from '../../../helpers/runCommand.js'
 
 describe('container push', function () {
diff --git a/test/unit/commands/container/run.unit.test.ts b/test/unit/commands/container/run.unit.test.ts
index bfbf30beec..d4c9fa923b 100644
--- a/test/unit/commands/container/run.unit.test.ts
+++ b/test/unit/commands/container/run.unit.test.ts
@@ -3,7 +3,7 @@ import Cmd from '../../../../src/commands/container/run.js'
 import runCommand from '../../../helpers/runCommand.js'
 import sinon from 'sinon'
 import {expect} from 'chai'
-import {DockerHelper} from '../../../../src/lib/container/docker_helper.js'
+import {DockerHelper} from '../../../../src/lib/container/docker-helper.js'
 import expectOutput from '../../../helpers/utils/expectOutput.js'
 import {Errors} from '@oclif/core'
 import nock from 'nock'
diff --git a/test/unit/commands/data/pg/create.unit.test.ts b/test/unit/commands/data/pg/create.unit.test.ts
index 3e492d6543..ee490dcb91 100644
--- a/test/unit/commands/data/pg/create.unit.test.ts
+++ b/test/unit/commands/data/pg/create.unit.test.ts
@@ -6,7 +6,7 @@ import {stderr, stdout} from 'stdout-stderr'
 import tsheredoc from 'tsheredoc'
 
 import DataPgCreate from '../../../../../src/commands/data/pg/create.js'
-import PoolConfig from '../../../../../src/lib/data/poolConfig.js'
+import PoolConfig from '../../../../../src/lib/data/pool-config.js'
 import {clearLevelsAndPricingCache} from '../../../../../src/lib/data/utils.js'
 import {
   createAddonResponse,
diff --git a/test/unit/commands/data/pg/update.unit.test.ts b/test/unit/commands/data/pg/update.unit.test.ts
index 49d4bae73d..93cbbfb9c0 100644
--- a/test/unit/commands/data/pg/update.unit.test.ts
+++ b/test/unit/commands/data/pg/update.unit.test.ts
@@ -9,7 +9,7 @@ import {stderr, stdout} from 'stdout-stderr'
 import tsheredoc from 'tsheredoc'
 
 import DataPgUpdate from '../../../../../src/commands/data/pg/update.js'
-import PoolConfig from '../../../../../src/lib/data/poolConfig.js'
+import PoolConfig from '../../../../../src/lib/data/pool-config.js'
 import {clearLevelsAndPricingCache} from '../../../../../src/lib/data/utils.js'
 import {
   addon,
diff --git a/test/unit/lib/confirm-command.unit.test.ts b/test/unit/lib/confirm-command.unit.test.ts
index 706227e548..d61c0b12ac 100644
--- a/test/unit/lib/confirm-command.unit.test.ts
+++ b/test/unit/lib/confirm-command.unit.test.ts
@@ -4,7 +4,7 @@ import sinon from 'sinon'
 import {stderr, stdout} from 'stdout-stderr'
 import ansis from 'ansis'
 
-import ConfirmCommand from '../../../src/lib/confirmCommand.js'
+import ConfirmCommand from '../../../src/lib/confirm-command.js'
 
 describe('confirmApp', function () {
   afterEach(function () {
diff --git a/test/unit/lib/container/docker_helper.unit.test.ts b/test/unit/lib/container/docker_helper.unit.test.ts
index 0893b51ec8..ec62151cef 100644
--- a/test/unit/lib/container/docker_helper.unit.test.ts
+++ b/test/unit/lib/container/docker_helper.unit.test.ts
@@ -1,4 +1,4 @@
-import {DockerHelper} from '../../../../src/lib/container/docker_helper.js'
+import {DockerHelper} from '../../../../src/lib/container/docker-helper.js'
 import {expect} from 'chai'
 import * as sinon from 'sinon'
 import * as path from 'path'
diff --git a/test/unit/lib/data/baseCommand.unit.test.ts b/test/unit/lib/data/baseCommand.unit.test.ts
index 6e1e9c26a4..5aa7769a0c 100644
--- a/test/unit/lib/data/baseCommand.unit.test.ts
+++ b/test/unit/lib/data/baseCommand.unit.test.ts
@@ -1,7 +1,7 @@
 import {expect} from 'chai'
 import nock from 'nock'
 
-import BaseCommand from '../../../../src/lib/data/baseCommand.js'
+import BaseCommand from '../../../../src/lib/data/base-command.js'
 import {runCommand} from '../../../helpers/run-command.js'
 
 class BaseCommandTest extends BaseCommand {
diff --git a/test/unit/lib/data/displayQuota.unit.test.ts b/test/unit/lib/data/displayQuota.unit.test.ts
index e47da150a8..0b8ea636b9 100644
--- a/test/unit/lib/data/displayQuota.unit.test.ts
+++ b/test/unit/lib/data/displayQuota.unit.test.ts
@@ -2,7 +2,7 @@ import {expect} from 'chai'
 import {stdout} from 'stdout-stderr'
 import tsheredoc from 'tsheredoc'
 
-import {displayQuota, formatQuotaStatus} from '../../../../src/lib/data/displayQuota.js'
+import {displayQuota, formatQuotaStatus} from '../../../../src/lib/data/display-quota.js'
 import {
   storageQuotaResponse, storageQuotaResponseCriticalNotify,
   storageQuotaResponseRestricted, storageQuotaResponseWarning,
diff --git a/test/unit/lib/data/parseProvisionOpts.unit.test.ts b/test/unit/lib/data/parseProvisionOpts.unit.test.ts
index 40a7b8c22a..7339d16f8e 100644
--- a/test/unit/lib/data/parseProvisionOpts.unit.test.ts
+++ b/test/unit/lib/data/parseProvisionOpts.unit.test.ts
@@ -1,6 +1,6 @@
 import {expect} from 'chai'
 
-import {parseProvisionOpts} from '../../../../src/lib/data/parseProvisionOpts.js'
+import {parseProvisionOpts} from '../../../../src/lib/data/parse-provision-opts.js'
 
 describe('parseProvisionOpts', function () {
   it('parses simple key:value pairs', function () {
diff --git a/test/unit/lib/pg/push_pull.unit.test.ts b/test/unit/lib/pg/push_pull.unit.test.ts
index e502f6255a..5534e78ed3 100644
--- a/test/unit/lib/pg/push_pull.unit.test.ts
+++ b/test/unit/lib/pg/push_pull.unit.test.ts
@@ -8,7 +8,7 @@ import sinon from 'sinon'
 
 import {
   connArgs, maybeTunnel, parseExclusions, prepare, spawnPipe, verifyExtensionsMatch,
-} from '../../../../src/lib/pg/push_pull.js'
+} from '../../../../src/lib/pg/push-pull.js'
 
 describe('push_pull', function () {
   describe('parseExclusions', function () {
diff --git a/test/unit/lib/utils/keyValueParser.unit.test.ts b/test/unit/lib/utils/keyValueParser.unit.test.ts
index f8e9208611..c384838df2 100644
--- a/test/unit/lib/utils/keyValueParser.unit.test.ts
+++ b/test/unit/lib/utils/keyValueParser.unit.test.ts
@@ -1,6 +1,6 @@
 import {expect} from 'chai'
 
-import parseKeyValue from '../../../../src/lib/utils/keyValueParser.js'
+import parseKeyValue from '../../../../src/lib/utils/key-value-parser.js'
 
 describe('parseKeyValue', function () {
   it('parses a simple key=value pair', function () {
diff --git a/test/unit/lib/utils/tableUtils.unit.test.ts b/test/unit/lib/utils/tableUtils.unit.test.ts
index c7c1cf5cad..c25437967b 100644
--- a/test/unit/lib/utils/tableUtils.unit.test.ts
+++ b/test/unit/lib/utils/tableUtils.unit.test.ts
@@ -3,7 +3,7 @@ import {ux} from '@oclif/core/ux'
 import {expect} from 'chai'
 import sinon from 'sinon'
 
-import {constructSortFilterTableOptions, constructTableColumns, huxTableNoWrapOptions, outputCSV} from '../../../../src/lib/utils/tableUtils.js'
+import {constructSortFilterTableOptions, constructTableColumns, huxTableNoWrapOptions, outputCSV} from '../../../../src/lib/utils/table-utils.js'
 
 describe('tableUtils', function () {
   describe('constructSortFilterTableOptions', function () {