diff --git a/src/commands/force/user/password/generate.ts b/src/commands/force/user/password/generate.ts
index 3992c8b7..7bd0bfcc 100644
--- a/src/commands/force/user/password/generate.ts
+++ b/src/commands/force/user/password/generate.ts
@@ -5,7 +5,6 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-
 import {
   arrayWithDeprecation,
   Flags,
@@ -17,13 +16,18 @@ import { Messages } from '@salesforce/core';
 import { ensureArray } from '@salesforce/kit';
 import { GenerateResult, UserPasswordGenerateBaseCommand } from '../../../../baseCommands/user/password/generate.js';
 
-Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-user', 'password.generate');
 
 export class ForceUserPasswordGenerateCommand extends UserPasswordGenerateBaseCommand {
   public static readonly summary = messages.getMessage('summary');
   public static readonly description = messages.getMessage('description');
   public static readonly examples = messages.getMessages('examples');
+  public static readonly state = 'deprecated';
+  public static readonly deprecationOptions = {
+    to: 'org generate password',
+  };
+  public static readonly hidden = true;
   public static readonly flags = {
     'on-behalf-of': arrayWithDeprecation({
       aliases: ['onbehalfof'],
diff --git a/src/commands/force/user/permset/assign.ts b/src/commands/force/user/permset/assign.ts
index b911b132..9e2ec67f 100644
--- a/src/commands/force/user/permset/assign.ts
+++ b/src/commands/force/user/permset/assign.ts
@@ -5,14 +5,12 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-
-
 import { Messages, Org } from '@salesforce/core';
 import { Flags, arrayWithDeprecation, loglevel, orgApiVersionFlagWithDeprecations } from '@salesforce/sf-plugins-core';
 import { ensureArray } from '@salesforce/kit';
 import { PermsetAssignResult, UserPermSetAssignBaseCommand } from '../../../../baseCommands/user/permset/assign.js';
 
-Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-user', 'permset.assign');
 
 export class ForceUserPermSetAssignCommand extends UserPermSetAssignBaseCommand {
@@ -20,6 +18,10 @@ export class ForceUserPermSetAssignCommand extends UserPermSetAssignBaseCommand
   public static readonly summary = messages.getMessage('summary');
   public static readonly description = messages.getMessage('description.force');
   public static readonly examples = messages.getMessages('examples.force');
+  public static readonly state = 'deprecated';
+  public static readonly deprecationOptions = {
+    to: 'org assign permset',
+  };
   public static readonly flags = {
     'perm-set-name': arrayWithDeprecation({
       aliases: ['permsetname'],
diff --git a/src/commands/force/user/permsetlicense/assign.ts b/src/commands/force/user/permsetlicense/assign.ts
index be347ea2..1ec9e7dc 100644
--- a/src/commands/force/user/permsetlicense/assign.ts
+++ b/src/commands/force/user/permsetlicense/assign.ts
@@ -5,14 +5,12 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-
-
 import { Messages } from '@salesforce/core';
 import { arrayWithDeprecation, Flags, loglevel, orgApiVersionFlagWithDeprecations } from '@salesforce/sf-plugins-core';
 import { ensureArray } from '@salesforce/kit';
 import { PSLResult, UserPermSetLicenseAssignBaseCommand } from '../../../../baseCommands/user/permsetlicense/assign.js';
 
-Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-user', 'permsetlicense.assign');
 
 export class ForceUserPermSetLicenseAssignCommand extends UserPermSetLicenseAssignBaseCommand {
@@ -20,6 +18,10 @@ export class ForceUserPermSetLicenseAssignCommand extends UserPermSetLicenseAssi
   public static readonly summary = messages.getMessage('summary');
   public static readonly description = messages.getMessage('description');
   public static readonly examples = messages.getMessages('examples');
+  public static readonly state = 'deprecated';
+  public static readonly deprecationOptions = {
+    to: 'org assign permsetlicense',
+  };
   public static readonly flags = {
     name: Flags.string({
       char: 'n',
diff --git a/src/commands/org/list/users.ts b/src/commands/org/list/users.ts
index c95686d0..9464bb78 100644
--- a/src/commands/org/list/users.ts
+++ b/src/commands/org/list/users.ts
@@ -5,7 +5,6 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-
 import { Connection, Messages, StateAggregator } from '@salesforce/core';
 import {
   Flags,
@@ -15,7 +14,7 @@ import {
   SfCommand,
 } from '@salesforce/sf-plugins-core';
 
-Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-user', 'list');
 
 export type AuthList = Partial<{
@@ -38,8 +37,8 @@ type ProfileInfo = { Id: string; Name: string };
 type ProfileInfoMap = Map<string, ProfileInfo>;
 
 export class ListUsersCommand extends SfCommand<ListUsers> {
-  // eslint-disable-next-line sf-plugin/encourage-alias-deprecation
   public static readonly aliases = ['force:user:list'];
+  public static readonly deprecateAliases = true;
   public static readonly summary = messages.getMessage('summary');
   public static readonly description = messages.getMessage('description');
   public static readonly examples = messages.getMessages('examples');