diff --git a/content/rdi/reference/cli/redis-di-add-context.md b/content/rdi/reference/cli/redis-di-add-context.md
index e8d86821440..b77133deeda 100644
--- a/content/rdi/reference/cli/redis-di-add-context.md
+++ b/content/rdi/reference/cli/redis-di-add-context.md
@@ -55,11 +55,11 @@ Usage: redis-di add-context [OPTIONS] CONTEXT_NAME
 
   Redis Enterprise Cluster username with either DB Member, Cluster Member or Cluster Admin roles
 
-- `rdi_username`:
+- `rdi_user`:
 
   - Type: STRING
   - Default: ``
-  - Usage: `--rdi-username`
+  - Usage: `--rdi-user`
 
   RDI Database Username
 
@@ -129,7 +129,7 @@ Options:
   --cluster-user TEXT             Redis Enterprise Cluster username with
                                   either DB Member, Cluster Member or Cluster
                                   Admin roles  [required]
-  --rdi-username TEXT             RDI Database Username
+  --rdi-user TEXT                 RDI Database Username
   --rdi-host TEXT                 Host/IP of RDI Database  [required]
   --rdi-port INTEGER RANGE        Port of RDI Database  [1000<=x<=65535;
                                   required]
diff --git a/content/rdi/reference/cli/redis-di-configure.md b/content/rdi/reference/cli/redis-di-configure.md
index 50aae77b6ee..d6c125c4e3b 100644
--- a/content/rdi/reference/cli/redis-di-configure.md
+++ b/content/rdi/reference/cli/redis-di-configure.md
@@ -41,11 +41,11 @@ Usage: redis-di configure [OPTIONS]
 
   Port of RDI Database
 
-- `rdi_username`:
+- `rdi_user`:
 
   - Type: STRING
   - Default: `none`
-  - Usage: `--rdi-username`
+  - Usage: `--rdi-user`
 
   RDI Database Username
 
@@ -110,7 +110,7 @@ Options:
   --rdi-host TEXT                 Host/IP of RDI Database  [required]
   --rdi-port INTEGER RANGE        Port of RDI Database  [1000<=x<=65535;
                                   required]
-  --rdi-username TEXT             RDI Database Username
+  --rdi-user TEXT                 RDI Database Username
   --rdi-password TEXT             RDI Database Password
   --rdi-key TEXT                  Private key file to authenticate with
   --rdi-cert TEXT                 Client certificate file to authenticate with
diff --git a/content/rdi/reference/cli/redis-di-delete.md b/content/rdi/reference/cli/redis-di-delete.md
index e1b85d8b9f4..54ac77e94e6 100644
--- a/content/rdi/reference/cli/redis-di-delete.md
+++ b/content/rdi/reference/cli/redis-di-delete.md
@@ -73,11 +73,11 @@ Usage: redis-di delete [OPTIONS]
 
   Port of RDI Database
 
-- `rdi_username`:
+- `rdi_user`:
 
   - Type: STRING
   - Default: `none`
-  - Usage: `--rdi-username`
+  - Usage: `--rdi-user`
 
   RDI Database Username
 
@@ -160,7 +160,7 @@ Options:
   --rdi-host TEXT                 Host/IP of RDI Database  [required]
   --rdi-port INTEGER RANGE        Port of RDI Database  [1000<=x<=65535;
                                   required]
-  --rdi-username TEXT             RDI Database Username
+  --rdi-user TEXT                 RDI Database Username
   --rdi-password TEXT             RDI Database Password
   --rdi-key TEXT                  Private key file to authenticate with
   --rdi-cert TEXT                 Client certificate file to authenticate with
diff --git a/content/rdi/reference/cli/redis-di-deploy.md b/content/rdi/reference/cli/redis-di-deploy.md
index 1054a409c41..777f2e95f3b 100644
--- a/content/rdi/reference/cli/redis-di-deploy.md
+++ b/content/rdi/reference/cli/redis-di-deploy.md
@@ -41,11 +41,11 @@ Usage: redis-di deploy [OPTIONS]
 
   Port of RDI Database
 
-- `rdi_username`:
+- `rdi_user`:
 
   - Type: STRING
   - Default: `none`
-  - Usage: `--rdi-username`
+  - Usage: `--rdi-user`
 
   RDI Database Username
 
@@ -118,7 +118,7 @@ Options:
   --rdi-host TEXT                 Host/IP of RDI Database  [required]
   --rdi-port INTEGER RANGE        Port of RDI Database  [1000<=x<=65535;
                                   required]
-  --rdi-username TEXT             RDI Database Username
+  --rdi-user TEXT                 RDI Database Username
   --rdi-password TEXT             RDI Database Password
   --rdi-key TEXT                  Private key file to authenticate with
   --rdi-cert TEXT                 Client certificate file to authenticate with
diff --git a/content/rdi/reference/cli/redis-di-describe-job.md b/content/rdi/reference/cli/redis-di-describe-job.md
index bf6b3db381f..207e515966c 100644
--- a/content/rdi/reference/cli/redis-di-describe-job.md
+++ b/content/rdi/reference/cli/redis-di-describe-job.md
@@ -47,11 +47,11 @@ Usage: redis-di describe-job [OPTIONS] JOB_NAME
 
   Port of RDI Database
 
-- `rdi_username`:
+- `rdi_user`:
 
   - Type: STRING
   - Default: `none`
-  - Usage: `--rdi-username`
+  - Usage: `--rdi-user`
 
   RDI Database Username
 
@@ -116,7 +116,7 @@ Options:
   --rdi-host TEXT                 Host/IP of RDI Database  [required]
   --rdi-port INTEGER RANGE        Port of RDI Database  [1000<=x<=65535;
                                   required]
-  --rdi-username TEXT             RDI Database Username
+  --rdi-user TEXT                 RDI Database Username
   --rdi-password TEXT             RDI Database Password
   --rdi-key TEXT                  Private key file to authenticate with
   --rdi-cert TEXT                 Client certificate file to authenticate with
diff --git a/content/rdi/reference/cli/redis-di-dump-support-package.md b/content/rdi/reference/cli/redis-di-dump-support-package.md
index 2bd2ffe66d4..00dcb8bc6d4 100644
--- a/content/rdi/reference/cli/redis-di-dump-support-package.md
+++ b/content/rdi/reference/cli/redis-di-dump-support-package.md
@@ -41,11 +41,11 @@ Usage: redis-di dump-support-package [OPTIONS]
 
   Port of RDI Database
 
-- `rdi_username`:
+- `rdi_user`:
 
   - Type: STRING
   - Default: `none`
-  - Usage: `--rdi-username`
+  - Usage: `--rdi-user`
 
   RDI Database Username
 
@@ -150,7 +150,7 @@ Options:
   --rdi-host TEXT                 Host/IP of RDI Database  [required]
   --rdi-port INTEGER RANGE        Port of RDI Database  [1000<=x<=65535;
                                   required]
-  --rdi-username TEXT             RDI Database Username
+  --rdi-user TEXT                 RDI Database Username
   --rdi-password TEXT             RDI Database Password
   --rdi-key TEXT                  Private key file to authenticate with
   --rdi-cert TEXT                 Client certificate file to authenticate with
diff --git a/content/rdi/reference/cli/redis-di-get-rejected.md b/content/rdi/reference/cli/redis-di-get-rejected.md
index 036de1c5601..7ef6fc255ae 100644
--- a/content/rdi/reference/cli/redis-di-get-rejected.md
+++ b/content/rdi/reference/cli/redis-di-get-rejected.md
@@ -41,11 +41,11 @@ Usage: redis-di get-rejected [OPTIONS]
 
   Port of RDI Database
 
-- `rdi_username`:
+- `rdi_user`:
 
   - Type: STRING
   - Default: `none`
-  - Usage: `--rdi-username`
+  - Usage: `--rdi-user`
 
   RDI Database Username
 
@@ -135,7 +135,7 @@ Options:
   --rdi-host TEXT                 Host/IP of RDI Database  [required]
   --rdi-port INTEGER RANGE        Port of RDI Database  [1000<=x<=65535;
                                   required]
-  --rdi-username TEXT             RDI Database Username
+  --rdi-user TEXT                 RDI Database Username
   --rdi-password TEXT             RDI Database Password
   --rdi-key TEXT                  Private key file to authenticate with
   --rdi-cert TEXT                 Client certificate file to authenticate with
diff --git a/content/rdi/reference/cli/redis-di-list-jobs.md b/content/rdi/reference/cli/redis-di-list-jobs.md
index d110424869e..9e07c72f84c 100644
--- a/content/rdi/reference/cli/redis-di-list-jobs.md
+++ b/content/rdi/reference/cli/redis-di-list-jobs.md
@@ -41,11 +41,11 @@ Usage: redis-di list-jobs [OPTIONS]
 
   Port of RDI Database
 
-- `rdi_username`:
+- `rdi_user`:
 
   - Type: STRING
   - Default: `none`
-  - Usage: `--rdi-username`
+  - Usage: `--rdi-user`
 
   RDI Database Username
 
@@ -110,7 +110,7 @@ Options:
   --rdi-host TEXT                 Host/IP of RDI Database  [required]
   --rdi-port INTEGER RANGE        Port of RDI Database  [1000<=x<=65535;
                                   required]
-  --rdi-username TEXT             RDI Database Username
+  --rdi-user TEXT                 RDI Database Username
   --rdi-password TEXT             RDI Database Password
   --rdi-key TEXT                  Private key file to authenticate with
   --rdi-cert TEXT                 Client certificate file to authenticate with
diff --git a/content/rdi/reference/cli/redis-di-monitor.md b/content/rdi/reference/cli/redis-di-monitor.md
index 93590062346..ab700be77a8 100644
--- a/content/rdi/reference/cli/redis-di-monitor.md
+++ b/content/rdi/reference/cli/redis-di-monitor.md
@@ -41,11 +41,11 @@ Usage: redis-di monitor [OPTIONS]
 
   Port of RDI Database
 
-- `rdi_username`:
+- `rdi_user`:
 
   - Type: STRING
   - Default: `none`
-  - Usage: `--rdi-username`
+  - Usage: `--rdi-user`
 
   RDI Database Username
 
@@ -126,7 +126,7 @@ Options:
   --rdi-host TEXT                 Host/IP of RDI Database  [required]
   --rdi-port INTEGER RANGE        Port of RDI Database  [1000<=x<=65535;
                                   required]
-  --rdi-username TEXT             RDI Database Username
+  --rdi-user TEXT                 RDI Database Username
   --rdi-password TEXT             RDI Database Password
   --rdi-key TEXT                  Private key file to authenticate with
   --rdi-cert TEXT                 Client certificate file to authenticate with
diff --git a/content/rdi/reference/cli/redis-di-reset.md b/content/rdi/reference/cli/redis-di-reset.md
index 41602f71589..c8fa5757d6f 100644
--- a/content/rdi/reference/cli/redis-di-reset.md
+++ b/content/rdi/reference/cli/redis-di-reset.md
@@ -41,11 +41,11 @@ Usage: redis-di reset [OPTIONS]
 
   Port of RDI Database
 
-- `rdi_username`:
+- `rdi_user`:
 
   - Type: STRING
   - Default: `none`
-  - Usage: `--rdi-username`
+  - Usage: `--rdi-user`
 
   RDI Database Username
 
@@ -119,7 +119,7 @@ Options:
   --rdi-host TEXT                 Host/IP of RDI Database  [required]
   --rdi-port INTEGER RANGE        Port of RDI Database  [1000<=x<=65535;
                                   required]
-  --rdi-username TEXT             RDI Database Username
+  --rdi-user TEXT                 RDI Database Username
   --rdi-password TEXT             RDI Database Password
   --rdi-key TEXT                  Private key file to authenticate with
   --rdi-cert TEXT                 Client certificate file to authenticate with
diff --git a/content/rdi/reference/cli/redis-di-set-secret.md b/content/rdi/reference/cli/redis-di-set-secret.md
index c60fc825be7..d6cb962be99 100644
--- a/content/rdi/reference/cli/redis-di-set-secret.md
+++ b/content/rdi/reference/cli/redis-di-set-secret.md
@@ -73,11 +73,11 @@ Usage: redis-di set-secret [OPTIONS]
 
   Port of RDI Database
 
-- `rdi_username`:
+- `rdi_user`:
 
   - Type: STRING
   - Default: `none`
-  - Usage: `--rdi-username`
+  - Usage: `--rdi-user`
 
   RDI Database Username
 
@@ -167,7 +167,7 @@ Options:
   --rdi-host TEXT                 Host/IP of RDI Database  [required]
   --rdi-port INTEGER RANGE        Port of RDI Database  [1000<=x<=65535;
                                   required]
-  --rdi-username TEXT             RDI Database Username
+  --rdi-user TEXT                 RDI Database Username
   --rdi-password TEXT             RDI Database Password
   --rdi-key TEXT                  Private key file to authenticate with
   --rdi-cert TEXT                 Client certificate file to authenticate with
diff --git a/content/rdi/reference/cli/redis-di-start.md b/content/rdi/reference/cli/redis-di-start.md
index cfbc310ddd1..7e60b79c90d 100644
--- a/content/rdi/reference/cli/redis-di-start.md
+++ b/content/rdi/reference/cli/redis-di-start.md
@@ -41,11 +41,11 @@ Usage: redis-di start [OPTIONS]
 
   Port of RDI Database
 
-- `rdi_username`:
+- `rdi_user`:
 
   - Type: STRING
   - Default: `none`
-  - Usage: `--rdi-username`
+  - Usage: `--rdi-user`
 
   RDI Database Username
 
@@ -110,7 +110,7 @@ Options:
   --rdi-host TEXT                 Host/IP of RDI Database  [required]
   --rdi-port INTEGER RANGE        Port of RDI Database  [1000<=x<=65535;
                                   required]
-  --rdi-username TEXT             RDI Database Username
+  --rdi-user TEXT                 RDI Database Username
   --rdi-password TEXT             RDI Database Password
   --rdi-key TEXT                  Private key file to authenticate with
   --rdi-cert TEXT                 Client certificate file to authenticate with
diff --git a/content/rdi/reference/cli/redis-di-status.md b/content/rdi/reference/cli/redis-di-status.md
index f50d02a6ad7..4427915bf97 100644
--- a/content/rdi/reference/cli/redis-di-status.md
+++ b/content/rdi/reference/cli/redis-di-status.md
@@ -41,11 +41,11 @@ Usage: redis-di status [OPTIONS]
 
   Port of RDI Database
 
-- `rdi_username`:
+- `rdi_user`:
 
   - Type: STRING
   - Default: `none`
-  - Usage: `--rdi-username`
+  - Usage: `--rdi-user`
 
   RDI Database Username
 
@@ -146,7 +146,7 @@ Options:
   --rdi-host TEXT                 Host/IP of RDI Database  [required]
   --rdi-port INTEGER RANGE        Port of RDI Database  [1000<=x<=65535;
                                   required]
-  --rdi-username TEXT             RDI Database Username
+  --rdi-user TEXT                 RDI Database Username
   --rdi-password TEXT             RDI Database Password
   --rdi-key TEXT                  Private key file to authenticate with
   --rdi-cert TEXT                 Client certificate file to authenticate with
diff --git a/content/rdi/reference/cli/redis-di-stop.md b/content/rdi/reference/cli/redis-di-stop.md
index 4d21de832cd..cbdfafa569f 100644
--- a/content/rdi/reference/cli/redis-di-stop.md
+++ b/content/rdi/reference/cli/redis-di-stop.md
@@ -41,11 +41,11 @@ Usage: redis-di stop [OPTIONS]
 
   Port of RDI Database
 
-- `rdi_username`:
+- `rdi_user`:
 
   - Type: STRING
   - Default: `none`
-  - Usage: `--rdi-username`
+  - Usage: `--rdi-user`
 
   RDI Database Username
 
@@ -110,7 +110,7 @@ Options:
   --rdi-host TEXT                 Host/IP of RDI Database  [required]
   --rdi-port INTEGER RANGE        Port of RDI Database  [1000<=x<=65535;
                                   required]
-  --rdi-username TEXT             RDI Database Username
+  --rdi-user TEXT                 RDI Database Username
   --rdi-password TEXT             RDI Database Password
   --rdi-key TEXT                  Private key file to authenticate with
   --rdi-cert TEXT                 Client certificate file to authenticate with
diff --git a/content/rdi/reference/cli/redis-di-trace.md b/content/rdi/reference/cli/redis-di-trace.md
index c82d53ad6fa..977b311401b 100644
--- a/content/rdi/reference/cli/redis-di-trace.md
+++ b/content/rdi/reference/cli/redis-di-trace.md
@@ -41,11 +41,11 @@ Usage: redis-di trace [OPTIONS]
 
   Port of RDI Database
 
-- `rdi_username`:
+- `rdi_user`:
 
   - Type: STRING
   - Default: `none`
-  - Usage: `--rdi-username`
+  - Usage: `--rdi-user`
 
   RDI Database Username
 
@@ -134,7 +134,7 @@ Options:
   --rdi-host TEXT                 Host/IP of RDI Database  [required]
   --rdi-port INTEGER RANGE        Port of RDI Database  [1000<=x<=65535;
                                   required]
-  --rdi-username TEXT             RDI Database Username
+  --rdi-user TEXT                 RDI Database Username
   --rdi-password TEXT             RDI Database Password
   --rdi-key TEXT                  Private key file to authenticate with
   --rdi-cert TEXT                 Client certificate file to authenticate with
diff --git a/content/rdi/reference/cli/redis-di-upgrade.md b/content/rdi/reference/cli/redis-di-upgrade.md
index 0f1365049fd..7a55e1b2aa4 100644
--- a/content/rdi/reference/cli/redis-di-upgrade.md
+++ b/content/rdi/reference/cli/redis-di-upgrade.md
@@ -73,11 +73,11 @@ Usage: redis-di upgrade [OPTIONS]
 
   Port of RDI Database
 
-- `rdi_username`:
+- `rdi_user`:
 
   - Type: STRING
   - Default: `none`
-  - Usage: `--rdi-username`
+  - Usage: `--rdi-user`
 
   RDI Database Username
 
@@ -160,7 +160,7 @@ Options:
   --rdi-host TEXT                 Host/IP of RDI Database  [required]
   --rdi-port INTEGER RANGE        Port of RDI Database  [1000<=x<=65535;
                                   required]
-  --rdi-username TEXT             RDI Database Username
+  --rdi-user TEXT                 RDI Database Username
   --rdi-password TEXT             RDI Database Password
   --rdi-key TEXT                  Private key file to authenticate with
   --rdi-cert TEXT                 Client certificate file to authenticate with