SERVER-51372 Add command_name field to IDL command syntax

44 files changed, 89 insertions, 0 deletions

diff --git a/src/mongo/db/commands/create.idl b/src/mongo/db/commands/create.idl
index 8cce1daf4dd..5c4fdfef520 100644
--- a/src/mongo/db/commands/create.idl
+++ b/src/mongo/db/commands/create.idl
@@ -70,6 +70,7 @@ structs:
 commands:
     create:
         description: "Parser for the 'create' Command"
+        command_name: create
         namespace: concatenate_with_db
         cpp_name: CreateCommand
         strict: true
diff --git a/src/mongo/db/commands/drop_connections.idl b/src/mongo/db/commands/drop_connections.idl
index 7d41e108889..57938b565f5 100644
--- a/src/mongo/db/commands/drop_connections.idl
+++ b/src/mongo/db/commands/drop_connections.idl
@@ -38,6 +38,7 @@ imports:
 commands:
     dropConnections:
         description: "An administrative command which takes a list of host and ports and drops pooled connections to them"
+        command_name: dropConnections
         namespace: ignored
         fields: 
             hostAndPort:
diff --git a/src/mongo/db/commands/generic.idl b/src/mongo/db/commands/generic.idl
index a673a066113..4bfacb9a489 100644
--- a/src/mongo/db/commands/generic.idl
+++ b/src/mongo/db/commands/generic.idl
@@ -53,6 +53,7 @@ structs:
 commands:
     logMessage:
         description: "Log a message on the server"
+        command_name: logMessage
         namespace: type
         type: string
         cpp_name: LogMessageCommand
@@ -76,6 +77,7 @@ commands:
 
     ping:
         description: "Parser for the 'ping' command."
+        command_name: ping
         strict: true
         api_version: 1
         namespace: ignored
diff --git a/src/mongo/db/commands/http_client.idl b/src/mongo/db/commands/http_client.idl
index 9395fa839ba..f1d6131fb68 100644
--- a/src/mongo/db/commands/http_client.idl
+++ b/src/mongo/db/commands/http_client.idl
@@ -49,6 +49,7 @@ structs:
 commands:
     httpClientRequest:
         description: "Fetch an HTTP(S) resource via GET"
+        command_name: httpClientRequest
         namespace: ignored
         fields:
             uri:
diff --git a/src/mongo/db/commands/internal_rename_if_options_and_indexes_match.idl b/src/mongo/db/commands/internal_rename_if_options_and_indexes_match.idl
index fd0ec5f6ecf..8cd19875d7a 100644
--- a/src/mongo/db/commands/internal_rename_if_options_and_indexes_match.idl
+++ b/src/mongo/db/commands/internal_rename_if_options_and_indexes_match.idl
@@ -36,6 +36,7 @@ commands:
         description: "An internal command that does a rename, but first checks to make sure the
                       indexes and collection options on the destination match those given in the
                        command."
+        command_name: internalRenameIfOptionsAndIndexesMatch
         namespace: ignored
         fields:
             from:
diff --git a/src/mongo/db/commands/kill_operations.idl b/src/mongo/db/commands/kill_operations.idl
index d0bba956fea..b9533a42c40 100644
--- a/src/mongo/db/commands/kill_operations.idl
+++ b/src/mongo/db/commands/kill_operations.idl
@@ -34,6 +34,7 @@ imports:
 
 commands:
     _killOperations:
+        command_name: "_killOperations"
         cpp_name: KillOperationsRequest
         description: "Interrupt a list of operations on a remote server"
         namespace: ignored
diff --git a/src/mongo/db/commands/list_databases.idl b/src/mongo/db/commands/list_databases.idl
index c35ffc1e304..83e3e8f5351 100644
--- a/src/mongo/db/commands/list_databases.idl
+++ b/src/mongo/db/commands/list_databases.idl
@@ -36,6 +36,7 @@ imports:
 commands:
     listDatabasesCommand:
         description: "listDatabases Command"
+        command_name: "listDatabases"
         namespace: ignored
         fields:
             nameOnly:
diff --git a/src/mongo/db/commands/map_reduce.idl b/src/mongo/db/commands/map_reduce.idl
index 6c89d81d34a..592e4e21c74 100644
--- a/src/mongo/db/commands/map_reduce.idl
+++ b/src/mongo/db/commands/map_reduce.idl
@@ -70,6 +70,7 @@ types:
 commands:
     MapReduce:
         description: "The MapReduce command."
+        command_name: "MapReduce"
         namespace: concatenate_with_db
         strict: true
         fields:
diff --git a/src/mongo/db/commands/profile.idl b/src/mongo/db/commands/profile.idl
index 91a90567d52..15ec549c668 100644
--- a/src/mongo/db/commands/profile.idl
+++ b/src/mongo/db/commands/profile.idl
@@ -45,6 +45,7 @@ commands:
 
   profile:
     description: "Parser for the 'profile' command."
+    command_name: "profile"
     cpp_name: ProfileCmdRequest
     strict: false
     namespace: type
diff --git a/src/mongo/db/commands/rename_collection.idl b/src/mongo/db/commands/rename_collection.idl
index 37a2bcba946..51f6317ea15 100644
--- a/src/mongo/db/commands/rename_collection.idl
+++ b/src/mongo/db/commands/rename_collection.idl
@@ -35,6 +35,7 @@ imports:
 commands:
     renameCollection:
         description: "Parser for the 'renameCollection' command."
+        command_name: renameCollection
         cpp_name: RenameCollectionCommand
         strict: true
         namespace: type
diff --git a/src/mongo/db/commands/resize_oplog.idl b/src/mongo/db/commands/resize_oplog.idl
index 00c9aa21e87..4e9d9fe9ccf 100644
--- a/src/mongo/db/commands/resize_oplog.idl
+++ b/src/mongo/db/commands/resize_oplog.idl
@@ -35,6 +35,7 @@ imports:
 commands:
     replSetResizeOplog:
         description: "Parser for the 'replSetResizeOplog' command."
+        command_name: replSetResizeOplog
         cpp_name: ReplSetResizeOplogRequest
         strict: false
         namespace: type
diff --git a/src/mongo/db/commands/rotate_certificates.idl b/src/mongo/db/commands/rotate_certificates.idl
index 1b65a854df4..5ebc8e1678f 100644
--- a/src/mongo/db/commands/rotate_certificates.idl
+++ b/src/mongo/db/commands/rotate_certificates.idl
@@ -37,6 +37,7 @@ imports:
 commands:
     rotateCertificates:
         description: "An administrative command which rotates the certificates to be used by new SSL connections"
+        command_name: rotateCertificates
         namespace: ignored
         fields:
             message:
diff --git a/src/mongo/db/commands/rwc_defaults_commands.idl b/src/mongo/db/commands/rwc_defaults_commands.idl
index 6d0f8d98c32..8b9997b03a1 100644
--- a/src/mongo/db/commands/rwc_defaults_commands.idl
+++ b/src/mongo/db/commands/rwc_defaults_commands.idl
@@ -57,6 +57,7 @@ structs:
 commands:
     setDefaultRWConcern:
         description: "Set the current read/write concern defaults (cluster-wide)"
+        command_name: setDefaultRWConcern
         namespace: ignored
         fields:
             defaultReadConcern:
@@ -70,6 +71,7 @@ commands:
 
     getDefaultRWConcern:
         description: "Get the current read/write concern defaults being applied by this node"
+        command_name: getDefaultRWConcern
         namespace: ignored
         fields:
             inMemory:
diff --git a/src/mongo/db/commands/set_feature_compatibility_version.idl b/src/mongo/db/commands/set_feature_compatibility_version.idl
index 793fa587098..0c0f9214e10 100644
--- a/src/mongo/db/commands/set_feature_compatibility_version.idl
+++ b/src/mongo/db/commands/set_feature_compatibility_version.idl
@@ -37,6 +37,7 @@ imports:
 commands:
     setFeatureCompatibilityVersion:
         description: "Parser for the 'setFeatureCompatibilityVersion' command."
+        command_name: setFeatureCompatibilityVersion
         cpp_name: SetFeatureCompatibilityVersion
         strict: true
         namespace: type
diff --git a/src/mongo/db/commands/set_index_commit_quorum.idl b/src/mongo/db/commands/set_index_commit_quorum.idl
index 8925d73c904..fdbd5d20ad2 100644
--- a/src/mongo/db/commands/set_index_commit_quorum.idl
+++ b/src/mongo/db/commands/set_index_commit_quorum.idl
@@ -39,6 +39,7 @@ imports:
 
 commands:
     setIndexCommitQuorum:
+        command_name: setIndexCommitQuorum
         cpp_name: SetIndexCommitQuorum
         description: "Resets the commitQuorum for an index build."
         strict: false
diff --git a/src/mongo/db/commands/shutdown.idl b/src/mongo/db/commands/shutdown.idl
index b0864c7c61e..166bf4677ab 100644
--- a/src/mongo/db/commands/shutdown.idl
+++ b/src/mongo/db/commands/shutdown.idl
@@ -34,6 +34,7 @@ imports:
 
 commands:
     shutdown:
+        command_name: shutdown
         cpp_name: ShutdownRequest
         description: "Shutdown the database"
         namespace: ignored
diff --git a/src/mongo/db/commands/tenant_migration_donor_cmds.idl b/src/mongo/db/commands/tenant_migration_donor_cmds.idl
index b1e3416a379..c26b4848b26 100644
--- a/src/mongo/db/commands/tenant_migration_donor_cmds.idl
+++ b/src/mongo/db/commands/tenant_migration_donor_cmds.idl
@@ -54,6 +54,7 @@ structs:
 commands:
   donorStartMigration:
     description: "Parser for the 'donorStartMigration' command."
+    command_name: donorStartMigration
     strict: true
     namespace: ignored
     fields:
@@ -76,6 +77,7 @@ commands:
 
   donorForgetMigration:
     description: "Parser for the 'donorForgetMigration' command."
+    command_name: donorForgetMigration
     strict: true
     namespace: ignored
     fields:
diff --git a/src/mongo/db/commands/tenant_migration_recipient_cmds.idl b/src/mongo/db/commands/tenant_migration_recipient_cmds.idl
index c43fdef58e1..b2f8f4a7837 100644
--- a/src/mongo/db/commands/tenant_migration_recipient_cmds.idl
+++ b/src/mongo/db/commands/tenant_migration_recipient_cmds.idl
@@ -51,6 +51,7 @@ structs:
 commands:
   recipientSyncData:
     description: "Parser for the 'recipientSyncData' command."
+    command_name: recipientSyncData
     strict: true
     namespace: ignored
     fields:
@@ -86,6 +87,7 @@ commands:
 
   recipientForgetMigration:
     description: "Parser for the 'recipientForgetMigration' command."
+    command_name: recipientForgetMigration
     strict: true
     namespace: ignored
     fields:
diff --git a/src/mongo/db/commands/txn_cmds.idl b/src/mongo/db/commands/txn_cmds.idl
index c9a479c63c3..7a1bf5783bb 100644
--- a/src/mongo/db/commands/txn_cmds.idl
+++ b/src/mongo/db/commands/txn_cmds.idl
@@ -80,6 +80,7 @@ structs:
 commands:
     commitTransaction:
         description: "commitTransaction Command"
+        command_name: commitTransaction
         namespace: ignored
         fields:
             commitTimestamp:
@@ -95,4 +96,5 @@ commands:
 
     abortTransaction:
         description: "abortTransaction Command"
+        command_name: abortTransaction
         namespace: ignored
diff --git a/src/mongo/db/commands/txn_two_phase_commit_cmds.idl b/src/mongo/db/commands/txn_two_phase_commit_cmds.idl
index 1b36dff2d5e..022ad192b4b 100644
--- a/src/mongo/db/commands/txn_two_phase_commit_cmds.idl
+++ b/src/mongo/db/commands/txn_two_phase_commit_cmds.idl
@@ -43,11 +43,13 @@ structs:
 commands:
     prepareTransaction:
         description: "Parser for the 'prepareTransaction' command."
+        command_name: prepareTransaction
         strict: true
         namespace: ignored
 
     coordinateCommitTransaction:
         description: "Parser for the 'coordinateCommitTransaction' command."
+        command_name: coordinateCommitTransaction
         strict: false
         namespace: ignored
         fields:
diff --git a/src/mongo/db/commands/user_management_commands.idl b/src/mongo/db/commands/user_management_commands.idl
index 6fd68d27f65..406b5924164 100644
--- a/src/mongo/db/commands/user_management_commands.idl
+++ b/src/mongo/db/commands/user_management_commands.idl
@@ -71,6 +71,7 @@ structs:
 commands:
     createUser:
         description: "Create a user"
+        command_name: createUser
         namespace: type
         type: string
         cpp_name: CreateUserCommand
@@ -106,6 +107,7 @@ commands:
 
     updateUser:
         description: "Modify a user"
+        command_name: updateUser
         namespace: type
         type: string
         cpp_name: UpdateUserCommand
@@ -142,6 +144,7 @@ commands:
 
     dropUser:
         description: "Drop a single user"
+        command_name: dropUser
         namespace: type
         type: string
         cpp_name: DropUserCommand
@@ -149,12 +152,14 @@ commands:
 
     dropAllUsersFromDatabase:
         description: "Drop all users in the database"
+        command_name: dropAllUsersFromDatabase
         namespace: ignored
         cpp_name: DropAllUsersFromDatabaseCommand
         strict: true
 
     grantRolesToUser:
         description: "Grant additional roles to a user"
+        command_name: grantRolesToUser
         namespace: type
         type: string
         cpp_name: GrantRolesToUserCommand
@@ -166,6 +171,7 @@ commands:
 
     revokeRolesFromUser:
         description: "Revoke previously assigned roles from a user"
+        command_name: revokeRolesFromUser
         namespace: type
         type: string
         cpp_name: RevokeRolesFromUserCommand
@@ -177,6 +183,7 @@ commands:
 
     createRole:
         description: "Create a new role"
+        command_name: createRole
         namespace: type
         type: string
         cpp_name: CreateRoleCommand
@@ -195,6 +202,7 @@ commands:
 
     updateRole:
         description: "Update an existing role"
+        command_name: updateRole
         namespace: type
         type: string
         cpp_name: UpdateRoleCommand
@@ -215,6 +223,7 @@ commands:
 
     grantPrivilegesToRole:
         description: "Grants privileges to a role"
+        command_name: grantPrivilegesToRole
         namespace: type
         type: string
         cpp_name: GrantPrivilegesToRoleCommand
@@ -226,6 +235,7 @@ commands:
 
     revokePrivilegesFromRole:
         description: "Grants privileges to a role"
+        command_name: revokePrivilegesFromRole
         namespace: type
         type: string
         cpp_name: RevokePrivilegesFromRoleCommand
@@ -237,6 +247,7 @@ commands:
 
     grantRolesToRole:
         description: "Grant roles to a role"
+        command_name: grantRolesToRole
         namespace: type
         type: string
         cpp_name: GrantRolesToRoleCommand
@@ -248,6 +259,7 @@ commands:
 
     revokeRolesFromRole:
         description: "Revoke roles from a role"
+        command_name: revokeRolesFromRole
         namespace: type
         type: string
         cpp_name: RevokeRolesFromRoleCommand
@@ -263,6 +275,7 @@ commands:
             from any users or roles that reference it.  If any errors occur in the middle
             of that process it's possible to be left in a state where the role has been
             removed from some user/roles but otherwise still exists.
+        command_name: dropRole
         namespace: type
         type: string
         cpp_name: DropRoleCommand
@@ -274,6 +287,7 @@ commands:
             it must remove them from any users or other roles that reference them.  If any
             errors occur in the middle of that process it's possible to be left in a state
             where the roles have been removed from some user/roles but otherwise still exist.
+        command_name: dropAllRolesFromDatabase
         namespace: ignored
         cpp_name: DropAllRolesFromDatabaseCommand
         strict: true
diff --git a/src/mongo/db/commands/vote_commit_index_build.idl b/src/mongo/db/commands/vote_commit_index_build.idl
index 17adbb9a1c0..47e78b1b460 100644
--- a/src/mongo/db/commands/vote_commit_index_build.idl
+++ b/src/mongo/db/commands/vote_commit_index_build.idl
@@ -37,6 +37,7 @@ imports:
 
 commands:
     voteCommitIndexBuild:
+        command_name: voteCommitIndexBuild
         cpp_name: VoteCommitIndexBuild
         description: "An internal mongod command pertaining to cross replica set index builds"
         strict: false
diff --git a/src/mongo/db/commands_test_example.idl b/src/mongo/db/commands_test_example.idl
index 68a8ccb47b1..651c1c2cf2b 100644
--- a/src/mongo/db/commands_test_example.idl
+++ b/src/mongo/db/commands_test_example.idl
@@ -35,16 +35,19 @@ imports:
 commands:
   exampleIncrement:
     description: "increment an integer (TypedCommand example)"
+    command_name: exampleIncrement
     namespace: concatenate_with_db
     fields:
       i: int
   exampleVoid:
     description: "no return, just side effects"
+    command_name: exampleVoid
     namespace: concatenate_with_db
     fields:
       i: int
   exampleMinimal:
     description: "like exampleIncrement, but use MinimalInvocationBase"
+    command_name: exampleMinimal
     namespace: concatenate_with_db
     fields:
       i: int
diff --git a/src/mongo/db/free_mon/free_mon_commands.idl b/src/mongo/db/free_mon/free_mon_commands.idl
index 447b28f1a6d..1c2372c47c1 100644
--- a/src/mongo/db/free_mon/free_mon_commands.idl
+++ b/src/mongo/db/free_mon/free_mon_commands.idl
@@ -45,6 +45,7 @@ enums:
 commands:
     setFreeMonitoring:
         description: "setFreeMonitoring Command"
+        command_name: setFreeMonitoring
         namespace: ignored
         fields:
           action:
@@ -53,5 +54,6 @@ commands:
 
     getFreeMonitoringStatus:
         description: "getFreeMonitoringStatus Command"
+        command_name: getFreeMonitoringStatus
         namespace: ignored
 
diff --git a/src/mongo/db/ops/write_ops.idl b/src/mongo/db/ops/write_ops.idl
index 626d460b269..ee30fe65faa 100644
--- a/src/mongo/db/ops/write_ops.idl
+++ b/src/mongo/db/ops/write_ops.idl
@@ -163,6 +163,7 @@ commands:
 
     insert:
         description: "Parser for the 'insert' command."
+        command_name: insert
         strict: true
         namespace: concatenate_with_db
         chained_structs:
@@ -175,6 +176,7 @@ commands:
 
     update:
         description: "Parser for the 'update' command."
+        command_name: update
         strict: true
         namespace: concatenate_with_db
         chained_structs:
@@ -197,6 +199,7 @@ commands:
 
     delete:
         description: "Parser for the 'delete' command."
+        command_name: delete
         strict: true
         namespace: concatenate_with_db
         chained_structs:
diff --git a/src/mongo/db/query/count_command.idl b/src/mongo/db/query/count_command.idl
index 640710d89b3..8e5bd3ac27d 100644
--- a/src/mongo/db/query/count_command.idl
+++ b/src/mongo/db/query/count_command.idl
@@ -57,6 +57,7 @@ types:
 commands:
     count:
         description: "Parser for the 'count' command."
+        command_name: count
         cpp_name: CountCommand
         strict: true
         namespace: concatenate_with_db_or_uuid
diff --git a/src/mongo/db/query/distinct_command.idl b/src/mongo/db/query/distinct_command.idl
index 1e0e15516cd..7fdd7b04e25 100644
--- a/src/mongo/db/query/distinct_command.idl
+++ b/src/mongo/db/query/distinct_command.idl
@@ -35,6 +35,7 @@ imports:
 commands:
     distinct:
         description: "Parser for the 'distinct' command."
+        command_name: distinct
         cpp_name: DistinctCommand
         namespace: concatenate_with_db_or_uuid
         strict: true
diff --git a/src/mongo/db/query/kill_cursors.idl b/src/mongo/db/query/kill_cursors.idl
index d517ccdd477..1873de8c222 100644
--- a/src/mongo/db/query/kill_cursors.idl
+++ b/src/mongo/db/query/kill_cursors.idl
@@ -44,6 +44,7 @@ types:
 commands:
     killCursors:
         description: "Kills a specified set of cursors by ID."
+        command_name: killCursors
         cpp_name: KillCursorsRequest
         strict: true
         namespace: concatenate_with_db
diff --git a/src/mongo/db/repl/repl_set_test_egress.idl b/src/mongo/db/repl/repl_set_test_egress.idl
index a0ab849ff77..2fe83d3450c 100644
--- a/src/mongo/db/repl/repl_set_test_egress.idl
+++ b/src/mongo/db/repl/repl_set_test_egress.idl
@@ -42,6 +42,7 @@ structs:
 commands:
     replSetTestEgress:
         description: "Attempt to connect to a cluster member"
+        command_name: replSetTestEgress
         namespace: ignored
         fields:
             target:
diff --git a/src/mongo/db/s/add_shard_cmd.idl b/src/mongo/db/s/add_shard_cmd.idl
index 1a2b975bb54..8d67bfebba0 100644
--- a/src/mongo/db/s/add_shard_cmd.idl
+++ b/src/mongo/db/s/add_shard_cmd.idl
@@ -57,6 +57,7 @@ structs:
 
 commands:
     _addShard:
+        command_name: _addShard
         cpp_name: AddShard
         description: "_addShard Command"
         namespace: ignored
diff --git a/src/mongo/db/traffic_recorder.idl b/src/mongo/db/traffic_recorder.idl
index 3516f461d61..3e8f524ca09 100644
--- a/src/mongo/db/traffic_recorder.idl
+++ b/src/mongo/db/traffic_recorder.idl
@@ -59,6 +59,7 @@ structs:
 commands:
     startRecordingTraffic:
         description: "start recording Command"
+        command_name: startRecordingTraffic
         namespace: ignored
         fields:
             filename:
@@ -75,6 +76,7 @@ commands:
 
     stopRecordingTraffic:
         description: "stop recording Command"
+        command_name: stopRecordingTraffic
         namespace: ignored
 
 server_parameters:
diff --git a/src/mongo/idl/unittest.idl b/src/mongo/idl/unittest.idl
index 5163f443f58..a43cae26a33 100644
--- a/src/mongo/idl/unittest.idl
+++ b/src/mongo/idl/unittest.idl
@@ -647,6 +647,7 @@ structs:
 commands:
     BasicIgnoredCommand:
         description: UnitTest for a basic ignored command
+        command_name: BasicIgnoredCommand
         namespace: ignored
         fields:
             field1: int
@@ -654,6 +655,7 @@ commands:
 
     BasicConcatenateWithDbCommand:
         description: UnitTest for a basic concatenate_with_db command
+        command_name: BasicConcatenateWithDbCommand
         namespace: concatenate_with_db
         fields:
             field1: int
@@ -661,6 +663,7 @@ commands:
 
     BasicConcatenateWithDbOrUUIDCommand:
         description: UnitTest for a basic concatenate_with_db_or_uuid command
+        command_name: BasicConcatenateWithDbOrUUIDCommand
         namespace: concatenate_with_db_or_uuid
         fields:
             field1: int
@@ -668,6 +671,7 @@ commands:
 
     KnownFieldCommand:
         description: UnitTest for a command that has a field that is special known generic command field
+        command_name: KnownFieldCommand
         namespace: concatenate_with_db
         fields:
             field1: int
@@ -675,6 +679,7 @@ commands:
 
     DocSequenceCommand:
         description: UnitTest for a basic command with fields marked with supports_doc_sequence
+        command_name: DocSequenceCommand
         namespace: concatenate_with_db
         fields:
             field1: int
@@ -692,6 +697,7 @@ commands:
 
     DocSequenceCommandNonStrict:
         description: UnitTest for a basic command with fields marked with supports_doc_sequence and non-strict parsing
+        command_name: DocSequenceCommandNonStrict
         namespace: concatenate_with_db
         strict: false
         fields:
@@ -710,6 +716,7 @@ commands:
 
     chained_command_type_mixed:
         description: Chained command with chained types, structs, and fields
+        command_name: chained_command_type_mixed
         namespace: concatenate_with_db
         strict: false
         chained_types:
@@ -725,6 +732,7 @@ commands:
 
     CommandTypeStringCommand:
         description: Command with custom type string
+        command_name: CommandTypeStringCommand
         namespace: type
         type: string
         fields:
@@ -732,21 +740,25 @@ commands:
 
     CommandTypeArrayObjectCommand:
         description: Command with just an array of object parameter
+        command_name: CommandTypeArrayObjectCommand
         namespace: type
         type: array<object>
 
     CommandTypeStructCommand:
         description: Command with just a struct parameter
+        command_name: CommandTypeStructCommand
         namespace: type
         type: one_string
 
     CommandTypeArrayStructCommand:
         description: Command with just an array of struct parameter
+        command_name: CommandTypeArrayStructCommand
         namespace: type
         type: array<one_string>
 
     _underscore_command:
         description: Command with custom type string
+        command_name: _underscore_command
         namespace: type
         type: string
         cpp_name: WellNamedCommand
@@ -755,6 +767,7 @@ commands:
 
     int_type_command:
         description: Command with custom type int
+        command_name: int_type_command
         namespace: type
         type: int
         fields:
@@ -762,6 +775,7 @@ commands:
 
     int_array_type_command:
         description: Command with custom type for array of int
+        command_name: int_array_type_command
         namespace: type
         type: array<int>
         fields:
@@ -769,6 +783,7 @@ commands:
 
     validated_command:
         description: Renamed command with validator
+        command_name: validated_command
         namespace: ignored
         cpp_name: doubleBasicRanges
         fields:
@@ -781,5 +796,6 @@ commands:
 
     CommandWithReplyType:
         description: A command with its reply type specified by an IDL struct
+        command_name: CommandWithReplyType
         namespace: ignored
         reply_type: reply_type_struct
diff --git a/src/mongo/s/request_types/balancer_collection_status.idl b/src/mongo/s/request_types/balancer_collection_status.idl
index 1056bfdbd9b..50a311cd3bc 100644
--- a/src/mongo/s/request_types/balancer_collection_status.idl
+++ b/src/mongo/s/request_types/balancer_collection_status.idl
@@ -49,6 +49,7 @@ structs:
 
 commands:
     balancerCollectionStatus:
+        command_name: balancerCollectionStatus
         cpp_name: BalancerCollectionStatus
         description: "Public balancerCollectionStatus command on mongos"
         strict: true
@@ -56,6 +57,7 @@ commands:
         type: namespacestring
 
     _configsvrBalancerCollectionStatus:
+        command_name: _configsvrBalancerCollectionStatus
         cpp_name: ConfigsvrBalancerCollectionStatus
         description: "Internal balancerCollectionStatus command on the config server"
         strict: true
diff --git a/src/mongo/s/request_types/clear_jumbo_flag.idl b/src/mongo/s/request_types/clear_jumbo_flag.idl
index fc65a878ed1..71c309e98ca 100644
--- a/src/mongo/s/request_types/clear_jumbo_flag.idl
+++ b/src/mongo/s/request_types/clear_jumbo_flag.idl
@@ -37,6 +37,7 @@ imports:
 commands:
     clearJumboFlag:
         description: "clearJumboFlag command for mongos"
+        command_name: clearJumboFlag
         namespace: type
         type: namespacestring
         strict: false
@@ -53,6 +54,7 @@ commands:
                 optional: true
 
     _configsvrClearJumboFlag:
+        command_name: _configsvrClearJumboFlag
         cpp_name: ConfigsvrClearJumboFlag
         description: "internal clearJumboFlag command for config server"
         namespace: type
diff --git a/src/mongo/s/request_types/clone_catalog_data.idl b/src/mongo/s/request_types/clone_catalog_data.idl
index 4035e4bd4ed..e0fee387edd 100644
--- a/src/mongo/s/request_types/clone_catalog_data.idl
+++ b/src/mongo/s/request_types/clone_catalog_data.idl
@@ -37,6 +37,7 @@ imports:
 commands:
     cloneCatalogData:
         description: "The internal cloneCatalogData command on a shard"
+        command_name: cloneCatalogData
         namespace: type
         type: namespacestring
         strict: false
diff --git a/src/mongo/s/request_types/clone_collection_options_from_primary_shard.idl b/src/mongo/s/request_types/clone_collection_options_from_primary_shard.idl
index 6efbe2e7dab..d835d77df01 100644
--- a/src/mongo/s/request_types/clone_collection_options_from_primary_shard.idl
+++ b/src/mongo/s/request_types/clone_collection_options_from_primary_shard.idl
@@ -33,6 +33,7 @@ imports:
 
 commands:
     _cloneCollectionOptionsFromPrimaryShard:
+        command_name: _cloneCollectionOptionsFromPrimaryShard
         cpp_name: cloneCollectionOptionsFromPrimaryShard
         description: "Internal command to create a collection on a non-primary shard with the collection options from the primary shard."
         strict: true
diff --git a/src/mongo/s/request_types/create_database.idl b/src/mongo/s/request_types/create_database.idl
index c6bb7f20c2e..5c55b2ccdfb 100644
--- a/src/mongo/s/request_types/create_database.idl
+++ b/src/mongo/s/request_types/create_database.idl
@@ -36,6 +36,7 @@ imports:
 
 commands:
     _configsvrCreateDatabase:
+        command_name: _configsvrCreateDatabase
         cpp_name : ConfigsvrCreateDatabase
         description: "The internal createDatabase command on the config server"
         strict: false
diff --git a/src/mongo/s/request_types/ensure_chunk_version_is_greater_than.idl b/src/mongo/s/request_types/ensure_chunk_version_is_greater_than.idl
index ada0c53a7ac..e95eee88af8 100644
--- a/src/mongo/s/request_types/ensure_chunk_version_is_greater_than.idl
+++ b/src/mongo/s/request_types/ensure_chunk_version_is_greater_than.idl
@@ -37,6 +37,7 @@ imports:
 
 commands:
     _configsvrEnsureChunkVersionIsGreaterThan:
+        command_name: _configsvrEnsureChunkVersionIsGreaterThan
         cpp_name: ConfigsvrEnsureChunkVersionIsGreaterThan
         description: If a chunk matching 'requestedChunk' exists, bumps the chunk's version to one
                      greater than the current collection version.
diff --git a/src/mongo/s/request_types/flush_database_cache_updates.idl b/src/mongo/s/request_types/flush_database_cache_updates.idl
index d83ce343d5b..96938f6b230 100644
--- a/src/mongo/s/request_types/flush_database_cache_updates.idl
+++ b/src/mongo/s/request_types/flush_database_cache_updates.idl
@@ -37,6 +37,7 @@ imports:
 commands:
     _flushDatabaseCacheUpdates:
         description: "An internal command to wait for the last routing table cache refresh for a particular database to be persisted to disk"
+        command_name: _flushDatabaseCacheUpdates
         strict: true
         namespace: type
         type: string
diff --git a/src/mongo/s/request_types/flush_routing_table_cache_updates.idl b/src/mongo/s/request_types/flush_routing_table_cache_updates.idl
index 2fbceec3028..a692f02b3f6 100644
--- a/src/mongo/s/request_types/flush_routing_table_cache_updates.idl
+++ b/src/mongo/s/request_types/flush_routing_table_cache_updates.idl
@@ -37,6 +37,7 @@ imports:
 commands:
     _flushRoutingTableCacheUpdates:
         description: "An internal command to wait for the last routing table cache refresh for a particular namespace to be persisted to disk"
+        command_name: _flushRoutingTableCacheUpdates
         strict: true
         namespace: type
         type: namespacestring
@@ -47,6 +48,7 @@ commands:
                 default: true
     _flushRoutingTableCacheUpdatesWithWriteConcern:
         description: "The same behavior as _flushRoutingTableCacheUpdates but accepts writeConcern." 
+        command_name: _flushRoutingTableCacheUpdatesWithWriteConcern
         strict: true
         namespace: type
         type: namespacestring
diff --git a/src/mongo/s/request_types/get_database_version.idl b/src/mongo/s/request_types/get_database_version.idl
index ba094baab98..2f330bd1806 100644
--- a/src/mongo/s/request_types/get_database_version.idl
+++ b/src/mongo/s/request_types/get_database_version.idl
@@ -37,5 +37,6 @@ imports:
 commands:
     getDatabaseVersion:
         description: "An internal command to get a shard server's cached database version"
+        command_name: getDatabaseVersion
         namespace: type
         type: string
diff --git a/src/mongo/s/request_types/refine_collection_shard_key.idl b/src/mongo/s/request_types/refine_collection_shard_key.idl
index 5b03128620f..9e09f5a3d95 100644
--- a/src/mongo/s/request_types/refine_collection_shard_key.idl
+++ b/src/mongo/s/request_types/refine_collection_shard_key.idl
@@ -37,6 +37,7 @@ imports:
 commands:
     refineCollectionShardKey:
         description: "The public refineCollectionShardKey command on mongos"
+        command_name: refineCollectionShardKey
         strict: false
         namespace: type
         type: namespacestring
@@ -47,6 +48,7 @@ commands:
                 optional: false
     
     _configsvrRefineCollectionShardKey:
+        command_name: _configsvrRefineCollectionShardKey
         cpp_name: ConfigsvrRefineCollectionShardKey
         description: "The internal refineCollectionShardKey command on the config server"
         strict: false
diff --git a/src/mongo/s/request_types/reshard_collection.idl b/src/mongo/s/request_types/reshard_collection.idl
index 9f33729ecd4..78f8627c232 100644
--- a/src/mongo/s/request_types/reshard_collection.idl
+++ b/src/mongo/s/request_types/reshard_collection.idl
@@ -37,6 +37,7 @@ imports:
 commands:
   reshardCollection:
     description: "The public reshardCollection command on mongos."
+    command_name: reshardCollection
     strict: false
     namespace: type
     type: namespacestring
@@ -67,6 +68,7 @@ commands:
         optional: true
 
   _configsvrReshardCollection:
+    command_name: _configsvrReshardCollection
     cpp_name: ConfigsvrReshardCollection
     description: "The internal reshardCollection command on the config server."
     strict: false
diff --git a/src/mongo/s/request_types/wait_for_fail_point.idl b/src/mongo/s/request_types/wait_for_fail_point.idl
index b0df9d27e78..ff98202722b 100644
--- a/src/mongo/s/request_types/wait_for_fail_point.idl
+++ b/src/mongo/s/request_types/wait_for_fail_point.idl
@@ -37,6 +37,7 @@ imports:
 commands:
     waitForFailPoint:
         description: "wait for a fail point to be entered a certain number of times"
+        command_name: waitForFailPoint
         strict: false
         namespace: type
         type: string