diff --git a/default.yaml b/default.yaml
index 9a7cd356..4983d654 100644
--- a/default.yaml
+++ b/default.yaml
@@ -576,10 +576,11 @@ channels:
 
 # operator classes
 oper-classes:
-    # IRC operator: can ban and unban users from the server
-    "irc-oper":
+    # chat moderator: can ban/unban users from the server, join channels,
+    # fix mode issues and sort out vhosts.
+    "chat-moderator":
         # title shown in WHOIS
-        title: IRC Operator
+        title: Chat Moderator
 
         # capability names
         capabilities:
@@ -589,23 +590,23 @@ oper-classes:
             - "nofakelag"
             - "roleplay"
             - "relaymsg"
+            - "vhosts"
+            - "sajoin"
+            - "samode"
 
-    # server admin: has full control of application-level privileges, including
-    # nickname and channel registrations
+    # server admin: has full control of the ircd, including nickname and
+    # channel registrations
     "server-admin":
         # title shown in WHOIS
         title: Server Admin
 
         # oper class this extends from
-        extends: "irc-oper"
+        extends: "chat-moderator"
 
         # capability names
         capabilities:
             - "rehash"
             - "accreg"
-            - "sajoin"
-            - "samode"
-            - "vhosts"
             - "chanreg"
             - "history"
             - "defcon"
@@ -618,7 +619,7 @@ opers:
         class: "server-admin"
 
         # custom whois line
-        whois-line: is a server admin
+        whois-line: is the server administrator
 
         # custom hostname
         vhost: "staff"
@@ -647,11 +648,11 @@ opers:
         # granted automatically as soon as you connect with the right fingerprint.
         #auto: true
 
-    # example of a second, less privileged operator named 'alice'
+    # example of a moderator named 'alice'
     # (log in with /OPER alice <password>):
     #alice:
-    #    class: "irc-oper"
-    #    whois-line: "can help with moderation issues"
+    #    class: "chat-moderator"
+    #    whois-line: "can help with moderation issues!"
     #    password: "$2a$04$0123456789abcdef0123456789abcdef0123456789abcdef01234"
 
 # logging, takes inspiration from Insp
diff --git a/traditional.yaml b/traditional.yaml
index 7f9f2cfc..44299d9a 100644
--- a/traditional.yaml
+++ b/traditional.yaml
@@ -548,10 +548,11 @@ channels:
 
 # operator classes
 oper-classes:
-    # IRC operator: can ban and unban users from the server
-    "irc-oper":
+    # chat moderator: can ban/unban users from the server, join channels,
+    # fix mode issues and sort out vhosts.
+    "chat-moderator":
         # title shown in WHOIS
-        title: IRC Operator
+        title: Chat Moderator
 
         # capability names
         capabilities:
@@ -561,23 +562,23 @@ oper-classes:
             - "nofakelag"
             - "roleplay"
             - "relaymsg"
+            - "vhosts"
+            - "sajoin"
+            - "samode"
 
-    # server admin: has full control of application-level privileges, including
-    # nickname and channel registrations
+    # server admin: has full control of the ircd, including nickname and
+    # channel registrations
     "server-admin":
         # title shown in WHOIS
         title: Server Admin
 
         # oper class this extends from
-        extends: "irc-oper"
+        extends: "chat-moderator"
 
         # capability names
         capabilities:
             - "rehash"
             - "accreg"
-            - "sajoin"
-            - "samode"
-            - "vhosts"
             - "chanreg"
             - "history"
             - "defcon"
@@ -590,7 +591,7 @@ opers:
         class: "server-admin"
 
         # custom whois line
-        whois-line: is a server admin
+        whois-line: is the server administrator
 
         # custom hostname
         vhost: "staff"
@@ -619,11 +620,11 @@ opers:
         # granted automatically as soon as you connect with the right fingerprint.
         #auto: true
 
-    # example of a second, less privileged operator named 'alice'
+    # example of a moderator named 'alice'
     # (log in with /OPER alice <password>):
     #alice:
-    #    class: "irc-oper"
-    #    whois-line: "can help with moderation issues"
+    #    class: "chat-moderator"
+    #    whois-line: "can help with moderation issues!"
     #    password: "$2a$04$0123456789abcdef0123456789abcdef0123456789abcdef01234"
 
 # logging, takes inspiration from Insp