diff --git a/tools/cli/src/cli/domain/mod.rs b/tools/cli/src/cli/domain/mod.rs
index 82510f45a..9ad264d0a 100644
--- a/tools/cli/src/cli/domain/mod.rs
+++ b/tools/cli/src/cli/domain/mod.rs
@@ -7,7 +7,7 @@ use std::fs::read;
 impl DomainOpt {
     pub fn debug(&self) -> bool {
         match self {
-            DomainOpt::SetDisplayName(copt) => copt.copt.debug,
+            DomainOpt::SetDisplayname(copt) => copt.copt.debug,
             DomainOpt::SetLdapBasedn { copt, .. }
             | DomainOpt::SetImage { copt, .. }
             | DomainOpt::RemoveImage { copt }
@@ -19,7 +19,7 @@ impl DomainOpt {
 
     pub async fn exec(&self) {
         match self {
-            DomainOpt::SetDisplayName(opt) => {
+            DomainOpt::SetDisplayname(opt) => {
                 eprintln!(
                     "Attempting to set the domain's display name to: {:?}",
                     opt.new_display_name
diff --git a/tools/cli/src/opt/kanidm.rs b/tools/cli/src/opt/kanidm.rs
index 4cd7a485b..a1f27f83c 100644
--- a/tools/cli/src/opt/kanidm.rs
+++ b/tools/cli/src/opt/kanidm.rs
@@ -1078,7 +1078,7 @@ pub enum Oauth2Opt {
     #[clap(name = "delete")]
     /// Delete a oauth2 client
     Delete(Named),
-    /// Set a new displayname for a client
+    /// Set a new display name for a client
     #[clap(name = "set-displayname")]
     SetDisplayname(Oauth2SetDisplayname),
     /// Set a new name for this client. You may need to update
@@ -1197,7 +1197,7 @@ pub enum Oauth2Opt {
 }
 
 #[derive(Args, Debug)]
-pub struct OptSetDomainDisplayName {
+pub struct OptSetDomainDisplayname {
     #[clap(flatten)]
     copt: CommonOpt,
     #[clap(name = "new-display-name")]
@@ -1260,9 +1260,9 @@ pub enum DeniedNamesOpt {
 
 #[derive(Debug, Subcommand)]
 pub enum DomainOpt {
-    #[clap[name = "set-display-name"]]
+    #[clap[name = "set-displayname"]]
     /// Set the domain display name
-    SetDisplayName(OptSetDomainDisplayName),
+    SetDisplayname(OptSetDomainDisplayname),
     #[clap[name = "set-ldap-basedn"]]
     /// Change the basedn of this server. Takes effect after a server restart.
     /// Examples are `o=organisation` or `dc=domain,dc=name`. Must be a valid ldap