diff --git a/doc/iscsi.md b/doc/iscsi.md
index cebca4157..cf569da65 100644
--- a/doc/iscsi.md
+++ b/doc/iscsi.md
@@ -92,13 +92,13 @@ In addition to the configuration file, the iSCSI target may also be configured v
 
 ### Initiator groups
 
- - add_initiator_group -- Add an initiator group.
+ - iscsi_create_initiator_group -- Add an initiator group.
  - delete_initiator_group -- Delete an existing initiator group.
  - iscsi_initiator_group_add_initiators -- Add initiators to an existing initiator group.
  - iscsi_get_initiator_groups -- Show information about all available initiator groups.
 
 ~~~
-/path/to/spdk/scripts/rpc.py add_initiator_group 2 ANY 10.0.0.2/32
+/path/to/spdk/scripts/rpc.py iscsi_create_initiator_group 2 ANY 10.0.0.2/32
 ~~~
 
 ### Target nodes
@@ -246,7 +246,7 @@ $ ./scripts/rpc.py iscsi_create_portal_group 1 10.0.0.1:3260
 Create one initiator group with id 2 to accept any connection from 10.0.0.2/32:
 
 ```
-$ ./scripts/rpc.py add_initiator_group 2 ANY 10.0.0.2/32
+$ ./scripts/rpc.py iscsi_create_initiator_group 2 ANY 10.0.0.2/32
 ```
 
 Finally construct one target using previously created bdevs as LUN0 (Malloc0) and LUN1 (Malloc1)
diff --git a/doc/jsonrpc.md b/doc/jsonrpc.md
index 147c90a99..4d5415c39 100644
--- a/doc/jsonrpc.md
+++ b/doc/jsonrpc.md
@@ -268,7 +268,7 @@ Example response:
     "delete_initiator_group",
     "iscsi_initiator_group_remove_initiators",
     "iscsi_initiator_group_add_initiators",
-    "add_initiator_group",
+    "iscsi_create_initiator_group",
     "iscsi_get_initiator_groups",
     "iscsi_set_options",
     "set_bdev_options",
@@ -2974,7 +2974,7 @@ Example response:
 }
 ~~~
 
-## add_initiator_group method {#rpc_add_initiator_group}
+## iscsi_create_initiator_group method {#rpc_iscsi_create_initiator_group}
 
 Add an initiator group.
 
@@ -3003,7 +3003,7 @@ Example request:
     ]
   },
   "jsonrpc": "2.0",
-  "method": "add_initiator_group",
+  "method": "iscsi_create_initiator_group",
   "id": 1
 }
 ~~~
diff --git a/lib/iscsi/init_grp.c b/lib/iscsi/init_grp.c
index 5763e413f..ddd80e72e 100644
--- a/lib/iscsi/init_grp.c
+++ b/lib/iscsi/init_grp.c
@@ -758,7 +758,7 @@ iscsi_init_grp_config_json(struct spdk_iscsi_init_grp *ig,
 {
 	spdk_json_write_object_begin(w);
 
-	spdk_json_write_named_string(w, "method", "add_initiator_group");
+	spdk_json_write_named_string(w, "method", "iscsi_create_initiator_group");
 
 	spdk_json_write_name(w, "params");
 	iscsi_init_grp_info_json(ig, w);
diff --git a/lib/iscsi/iscsi_rpc.c b/lib/iscsi/iscsi_rpc.c
index 1ae968eab..b67df65d7 100644
--- a/lib/iscsi/iscsi_rpc.c
+++ b/lib/iscsi/iscsi_rpc.c
@@ -135,8 +135,8 @@ static const struct spdk_json_object_decoder rpc_initiator_group_decoders[] = {
 };
 
 static void
-spdk_rpc_add_initiator_group(struct spdk_jsonrpc_request *request,
-			     const struct spdk_json_val *params)
+spdk_rpc_iscsi_create_initiator_group(struct spdk_jsonrpc_request *request,
+				      const struct spdk_json_val *params)
 {
 	struct rpc_initiator_group req = {};
 	struct spdk_json_write_ctx *w;
@@ -172,7 +172,9 @@ invalid:
 	spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters");
 	free_rpc_initiator_group(&req);
 }
-SPDK_RPC_REGISTER("add_initiator_group", spdk_rpc_add_initiator_group, SPDK_RPC_RUNTIME)
+SPDK_RPC_REGISTER("iscsi_create_initiator_group", spdk_rpc_iscsi_create_initiator_group,
+		  SPDK_RPC_RUNTIME)
+SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_create_initiator_group, add_initiator_group)
 
 static const struct spdk_json_object_decoder rpc_add_or_delete_initiators_decoders[] = {
 	{"tag", offsetof(struct rpc_initiator_group, tag), spdk_json_decode_int32},
diff --git a/scripts/config_converter.py b/scripts/config_converter.py
index 746d15862..6605d537e 100755
--- a/scripts/config_converter.py
+++ b/scripts/config_converter.py
@@ -25,7 +25,7 @@ vhost_dict["construct_vhost_nvme_controller"] = []
 iscsi_dict = OrderedDict()
 iscsi_dict["iscsi_set_options"] = []
 iscsi_dict["iscsi_create_portal_group"] = []
-iscsi_dict["add_initiator_group"] = []
+iscsi_dict["iscsi_create_initiator_group"] = []
 iscsi_dict["iscsi_create_target_node"] = []
 
 nvmf_dict = OrderedDict()
@@ -559,7 +559,7 @@ def get_iscsi_initiator_group_json(config, name):
             "tag": int(re.findall(r'\d+', name)[0]),
             "netmasks": netmasks
         },
-        "method": "add_initiator_group"
+        "method": "iscsi_create_initiator_group"
     }
 
     return [initiator_group_json]
diff --git a/scripts/rpc.py b/scripts/rpc.py
index ea713c8fe..18e1210d9 100755
--- a/scripts/rpc.py
+++ b/scripts/rpc.py
@@ -987,20 +987,20 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
     Example: '192.168.100.100:3260 192.168.100.100:3261 192.168.100.100:3262""")
     p.set_defaults(func=iscsi_create_portal_group)
 
-    def add_initiator_group(args):
+    def iscsi_create_initiator_group(args):
         initiators = []
         netmasks = []
         for i in args.initiator_list.strip().split(' '):
             initiators.append(i)
         for n in args.netmask_list.strip().split(' '):
             netmasks.append(n)
-        rpc.iscsi.add_initiator_group(
+        rpc.iscsi.iscsi_create_initiator_group(
             args.client,
             tag=args.tag,
             initiators=initiators,
             netmasks=netmasks)
 
-    p = subparsers.add_parser('add_initiator_group',
+    p = subparsers.add_parser('iscsi_create_initiator_group', aliases=['add_initiator_group'],
                               help='Add an initiator group')
     p.add_argument(
         'tag', help='Initiator group tag (unique, integer > 0)', type=int)
@@ -1008,7 +1008,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
     enclosed in quotes.  Example: 'ANY' or '127.0.0.1 192.168.200.100'""")
     p.add_argument('netmask_list', help="""Whitespace-separated list of initiator netmasks enclosed in quotes.
     Example: '255.255.0.0 255.248.0.0' etc""")
-    p.set_defaults(func=add_initiator_group)
+    p.set_defaults(func=iscsi_create_initiator_group)
 
     def iscsi_initiator_group_add_initiators(args):
         initiators = None
diff --git a/scripts/rpc/iscsi.py b/scripts/rpc/iscsi.py
index 0705de549..d4738de37 100644
--- a/scripts/rpc/iscsi.py
+++ b/scripts/rpc/iscsi.py
@@ -388,7 +388,8 @@ def iscsi_create_portal_group(client, portals, tag):
     return client.call('iscsi_create_portal_group', params)
 
 
-def add_initiator_group(client, tag, initiators, netmasks):
+@deprecated_alias('add_initiator_group')
+def iscsi_create_initiator_group(client, tag, initiators, netmasks):
     """Add an initiator group.
 
     Args:
@@ -400,7 +401,7 @@ def add_initiator_group(client, tag, initiators, netmasks):
         True or False
     """
     params = {'tag': tag, 'initiators': initiators, 'netmasks': netmasks}
-    return client.call('add_initiator_group', params)
+    return client.call('iscsi_create_initiator_group', params)
 
 
 @deprecated_alias('add_initiators_to_initiator_group')
diff --git a/scripts/spdkcli/ui_root.py b/scripts/spdkcli/ui_root.py
index 7c76313de..61e0ec967 100644
--- a/scripts/spdkcli/ui_root.py
+++ b/scripts/spdkcli/ui_root.py
@@ -414,7 +414,7 @@ class UIRoot(UINode):
 
     @verbose
     def construct_initiator_group(self, **kwargs):
-        rpc.iscsi.add_initiator_group(self.client, **kwargs)
+        rpc.iscsi.iscsi_create_initiator_group(self.client, **kwargs)
 
     @verbose
     def delete_initiator_group(self, **kwargs):
diff --git a/test/config_converter/spdk_config.json b/test/config_converter/spdk_config.json
index 2bcaa81f8..c56368d36 100644
--- a/test/config_converter/spdk_config.json
+++ b/test/config_converter/spdk_config.json
@@ -454,7 +454,7 @@
               "127.0.0.1/32"
             ]
           },
-          "method": "add_initiator_group"
+          "method": "iscsi_create_initiator_group"
         },
         {
           "params": {
diff --git a/test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh b/test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh
index 0610c811d..1e40ada6b 100755
--- a/test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh
+++ b/test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh
@@ -30,7 +30,7 @@ echo "iscsi_tgt is listening. Running tests..."
 timing_exit start_iscsi_tgt
 
 $rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
-$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
+$rpc_py iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
 $rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE
 # "Malloc0:0" ==> use Malloc0 blockdev for LUN0
 # "1:2" ==> map PortalGroup1 to InitiatorGroup2
diff --git a/test/iscsi_tgt/calsoft/calsoft.sh b/test/iscsi_tgt/calsoft/calsoft.sh
index 49e5670ba..9be641d82 100755
--- a/test/iscsi_tgt/calsoft/calsoft.sh
+++ b/test/iscsi_tgt/calsoft/calsoft.sh
@@ -46,7 +46,7 @@ timing_exit start_iscsi_tgt
 $rpc_py iscsi_create_auth_group 1 -c 'user:root secret:tester'
 $rpc_py iscsi_set_discovery_auth -g 1
 $rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
-$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
+$rpc_py iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
 $rpc_py bdev_malloc_create -b MyBdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE
 # "MyBdev:0" ==> use MyBdev blockdev for LUN0
 # "1:2" ==> map PortalGroup1 to InitiatorGroup2
diff --git a/test/iscsi_tgt/digests/digests.sh b/test/iscsi_tgt/digests/digests.sh
index fb110b413..7f4d5f834 100755
--- a/test/iscsi_tgt/digests/digests.sh
+++ b/test/iscsi_tgt/digests/digests.sh
@@ -81,7 +81,7 @@ echo "iscsi_tgt is listening. Running tests..."
 timing_exit start_iscsi_tgt
 
 $rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
-$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
+$rpc_py iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
 $rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE
 # "Malloc0:0" ==> use Malloc0 blockdev for LUN0
 # "1:2" ==> map PortalGroup1 to InitiatorGroup2
diff --git a/test/iscsi_tgt/ext4test/ext4test.sh b/test/iscsi_tgt/ext4test/ext4test.sh
index 1b70bcc84..c8a26f9a1 100755
--- a/test/iscsi_tgt/ext4test/ext4test.sh
+++ b/test/iscsi_tgt/ext4test/ext4test.sh
@@ -32,7 +32,7 @@ echo "iscsi_tgt is listening. Running tests..."
 timing_exit start_iscsi_tgt
 
 $rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
-$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
+$rpc_py iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
 $rpc_py bdev_error_create 'Malloc0'
 # "1:2" ==> map PortalGroup1 to InitiatorGroup2
 # "64" ==> iSCSI queue depth 64
diff --git a/test/iscsi_tgt/filesystem/filesystem.sh b/test/iscsi_tgt/filesystem/filesystem.sh
index 1115d64d3..b1257d3e7 100755
--- a/test/iscsi_tgt/filesystem/filesystem.sh
+++ b/test/iscsi_tgt/filesystem/filesystem.sh
@@ -44,7 +44,7 @@ timing_exit start_iscsi_tgt
 
 bdf=$(iter_pci_class_code 01 08 02 | head -1)
 $rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
-$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
+$rpc_py iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
 $rpc_py bdev_nvme_attach_controller -b "Nvme0" -t "pcie" -a $bdf
 
 ls_guid=$($rpc_py bdev_lvol_create_lvstore Nvme0n1 lvs_0)
diff --git a/test/iscsi_tgt/fio/fio.sh b/test/iscsi_tgt/fio/fio.sh
index b34be4ca5..ecbfb6b8f 100755
--- a/test/iscsi_tgt/fio/fio.sh
+++ b/test/iscsi_tgt/fio/fio.sh
@@ -79,7 +79,7 @@ echo "iscsi_tgt is listening. Running tests..."
 timing_exit start_iscsi_tgt
 
 $rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
-$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
+$rpc_py iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
 # Create a RAID-0 bdev from two malloc bdevs
 malloc_bdevs="$($rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE) "
 malloc_bdevs+="$($rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)"
diff --git a/test/iscsi_tgt/initiator/initiator.sh b/test/iscsi_tgt/initiator/initiator.sh
index 6acbb8ad0..51c1a5b4c 100755
--- a/test/iscsi_tgt/initiator/initiator.sh
+++ b/test/iscsi_tgt/initiator/initiator.sh
@@ -30,7 +30,7 @@ echo "iscsi_tgt is listening. Running tests..."
 timing_exit start_iscsi_tgt
 
 $rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
-$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
+$rpc_py iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
 $rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE
 # "Malloc0:0" ==> use Malloc0 blockdev for LUN0
 # "1:2" ==> map PortalGroup1 to InitiatorGroup2
diff --git a/test/iscsi_tgt/ip_migration/ip_migration.sh b/test/iscsi_tgt/ip_migration/ip_migration.sh
index 1ac339d53..17586c9f0 100755
--- a/test/iscsi_tgt/ip_migration/ip_migration.sh
+++ b/test/iscsi_tgt/ip_migration/ip_migration.sh
@@ -28,7 +28,7 @@ function kill_all_iscsi_target() {
 function rpc_config() {
 	# $1 = RPC server address
 	# $2 = Netmask
-	$rpc_py -s $1 add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $2
+	$rpc_py -s $1 iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $2
 	$rpc_py -s $1 bdev_malloc_create 64 512
 }
 
diff --git a/test/iscsi_tgt/lvol/iscsi_lvol.sh b/test/iscsi_tgt/lvol/iscsi_lvol.sh
index b4d7984a9..c3c7d69db 100755
--- a/test/iscsi_tgt/lvol/iscsi_lvol.sh
+++ b/test/iscsi_tgt/lvol/iscsi_lvol.sh
@@ -45,7 +45,7 @@ $rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
 # Create remaining LVSs from a malloc bdev, respectively
 for i in $(seq 1 $NUM_LVS); do
 	INITIATOR_TAG=$((i + 2))
-	$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
+	$rpc_py iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
 	if [ $i -eq 1 ]; then
 		# construct RAID bdev and put its name in $bdev
 		malloc_bdevs="$($rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE) "
diff --git a/test/iscsi_tgt/multiconnection/multiconnection.sh b/test/iscsi_tgt/multiconnection/multiconnection.sh
index bc8ba04cc..4375970eb 100755
--- a/test/iscsi_tgt/multiconnection/multiconnection.sh
+++ b/test/iscsi_tgt/multiconnection/multiconnection.sh
@@ -49,7 +49,7 @@ $rootdir/scripts/gen_nvme.sh --json | $rpc_py load_subsystem_config
 timing_exit start_iscsi_tgt
 
 $rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
-$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
+$rpc_py iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
 
 echo "Creating an iSCSI target node."
 ls_guid=$($rpc_py bdev_lvol_create_lvstore "Nvme0n1" "lvs0" -c 1048576)
diff --git a/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh b/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
index 3adb3de8d..67cd1faa0 100755
--- a/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
+++ b/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
@@ -41,7 +41,7 @@ function run_nvme_remote() {
 
 	echo "Creating an iSCSI target node."
 	$rpc_py -s "$iscsi_rpc_addr" iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
-	$rpc_py -s "$iscsi_rpc_addr" add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
+	$rpc_py -s "$iscsi_rpc_addr" iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
 	if [ "$1" = "local" ]; then
 		$rpc_py -s "$iscsi_rpc_addr" bdev_nvme_attach_controller -b "Nvme0" -t "rdma" -f "ipv4" -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT -n nqn.2016-06.io.spdk:cnode1
 	fi
diff --git a/test/iscsi_tgt/perf/iscsi_target.sh b/test/iscsi_tgt/perf/iscsi_target.sh
index 5b52e3eca..6e690a8fa 100755
--- a/test/iscsi_tgt/perf/iscsi_target.sh
+++ b/test/iscsi_tgt/perf/iscsi_target.sh
@@ -98,7 +98,7 @@ elif [ $DISKNO -gt ${#bdevs[@]} ] || [ ! $DISKNO =~ ^[0-9]+$ ]; then
 fi
 
 $rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
-$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
+$rpc_py iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
 
 for (( i=0; i < $DISKNO; i++ ))
 do
diff --git a/test/iscsi_tgt/pmem/iscsi_pmem.sh b/test/iscsi_tgt/pmem/iscsi_pmem.sh
index 5c4f8f1c9..7893837f8 100755
--- a/test/iscsi_tgt/pmem/iscsi_pmem.sh
+++ b/test/iscsi_tgt/pmem/iscsi_pmem.sh
@@ -34,7 +34,7 @@ timing_enter setup
 $rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
 for i in $(seq 1 $TGT_NR); do
 	INITIATOR_TAG=$((i + 1))
-	$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
+	$rpc_py iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
 
 	luns=""
 	for j in $(seq 1 $PMEM_PER_TGT); do
diff --git a/test/iscsi_tgt/qos/qos.sh b/test/iscsi_tgt/qos/qos.sh
index 816c6cac6..4acee4dcd 100755
--- a/test/iscsi_tgt/qos/qos.sh
+++ b/test/iscsi_tgt/qos/qos.sh
@@ -66,7 +66,7 @@ echo "iscsi_tgt is listening. Running tests..."
 timing_exit start_iscsi_tgt
 
 $rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
-$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
+$rpc_py iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
 $rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE
 # "Malloc0:0" ==> use Malloc0 blockdev for LUN0
 # "1:2" ==> map PortalGroup1 to InitiatorGroup2
diff --git a/test/iscsi_tgt/rbd/rbd.sh b/test/iscsi_tgt/rbd/rbd.sh
index b5571f72b..a68029d6c 100755
--- a/test/iscsi_tgt/rbd/rbd.sh
+++ b/test/iscsi_tgt/rbd/rbd.sh
@@ -39,7 +39,7 @@ echo "iscsi_tgt is listening. Running tests..."
 timing_exit start_iscsi_tgt
 
 $rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
-$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
+$rpc_py iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
 rbd_bdev="$($rpc_py bdev_rbd_create $RBD_POOL $RBD_NAME 4096)"
 $rpc_py bdev_get_bdevs
 # "Ceph0:0" ==> use Ceph0 blockdev for LUN0
diff --git a/test/iscsi_tgt/reset/reset.sh b/test/iscsi_tgt/reset/reset.sh
index a8ed8fbf2..28f422646 100755
--- a/test/iscsi_tgt/reset/reset.sh
+++ b/test/iscsi_tgt/reset/reset.sh
@@ -37,7 +37,7 @@ echo "iscsi_tgt is listening. Running tests..."
 timing_exit start_iscsi_tgt
 
 $rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
-$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
+$rpc_py iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
 $rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE
 # "Malloc0:0" ==> use Malloc0 blockdev for LUN0
 # "1:2" ==> map PortalGroup1 to InitiatorGroup2
diff --git a/test/iscsi_tgt/rpc_config/rpc_config.py b/test/iscsi_tgt/rpc_config/rpc_config.py
index 2187479e7..d1a253db8 100755
--- a/test/iscsi_tgt/rpc_config/rpc_config.py
+++ b/test/iscsi_tgt/rpc_config/rpc_config.py
@@ -103,7 +103,7 @@ def verify_iscsi_connection_rpc_methods(rpc_py):
 
     rpc.bdev_malloc_create(rpc_param['malloc_bdev_size'], rpc_param['malloc_block_size'])
     rpc.iscsi_create_portal_group(portal_tag, "{}:{}".format(rpc_param['target_ip'], str(rpc_param['port'])))
-    rpc.add_initiator_group(initiator_tag, rpc_param['initiator_name'], rpc_param['netmask'])
+    rpc.iscsi_create_initiator_group(initiator_tag, rpc_param['initiator_name'], rpc_param['netmask'])
 
     lun_mapping = "Malloc" + str(rpc_param['lun_total']) + ":0"
     net_mapping = portal_tag + ":" + initiator_tag
@@ -145,7 +145,7 @@ def verify_scsi_devices_rpc_methods(rpc_py):
 
     rpc.bdev_malloc_create(rpc_param['malloc_bdev_size'], rpc_param['malloc_block_size'])
     rpc.iscsi_create_portal_group(portal_tag, "{}:{}".format(rpc_param['target_ip'], str(rpc_param['port'])))
-    rpc.add_initiator_group(initiator_tag, rpc_param['initiator_name'], rpc_param['netmask'])
+    rpc.iscsi_create_initiator_group(initiator_tag, rpc_param['initiator_name'], rpc_param['netmask'])
 
     lun_mapping = "Malloc" + str(rpc_param['lun_total']) + ":0"
     net_mapping = portal_tag + ":" + initiator_tag
@@ -250,7 +250,7 @@ def verify_initiator_groups_rpc_methods(rpc_py, rpc_param):
     for idx, value in enumerate(rpc_param['netmask']):
         # The initiator group tag must start at 1
         tag = idx + 1
-        rpc.add_initiator_group(tag, rpc_param['initiator_name'], value)
+        rpc.iscsi_create_initiator_group(tag, rpc_param['initiator_name'], value)
         output = rpc.iscsi_get_initiator_groups()
         jsonvalues = json.loads(output)
         verify(len(jsonvalues) == tag, 1,
@@ -334,7 +334,7 @@ def verify_target_nodes_rpc_methods(rpc_py, rpc_param):
 
     rpc.bdev_malloc_create(rpc_param['malloc_bdev_size'], rpc_param['malloc_block_size'])
     rpc.iscsi_create_portal_group(portal_tag, "{}:{}".format(rpc_param['target_ip'], str(rpc_param['port'])))
-    rpc.add_initiator_group(initiator_tag, rpc_param['initiator_name'], rpc_param['netmask'])
+    rpc.iscsi_create_initiator_group(initiator_tag, rpc_param['initiator_name'], rpc_param['netmask'])
 
     lun_mapping = "Malloc" + str(rpc_param['lun_total']) + ":0"
     net_mapping = portal_tag + ":" + initiator_tag
diff --git a/test/iscsi_tgt/trace_record/trace_record.sh b/test/iscsi_tgt/trace_record/trace_record.sh
index 4da13484b..384250f3c 100755
--- a/test/iscsi_tgt/trace_record/trace_record.sh
+++ b/test/iscsi_tgt/trace_record/trace_record.sh
@@ -59,7 +59,7 @@ echo "Trace record pid: $record_pid"
 
 RPCS=
 RPCS+="iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT\n"
-RPCS+="add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK\n"
+RPCS+="iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK\n"
 
 echo "Create bdevs and target nodes"
 CONNECTION_NUMBER=15
diff --git a/test/json_config/clear_config.py b/test/json_config/clear_config.py
index 9c46c2911..622c00a6c 100755
--- a/test/json_config/clear_config.py
+++ b/test/json_config/clear_config.py
@@ -87,7 +87,7 @@ def clear_nvmf_subsystem(args, nvmf_config):
 
 def get_iscsi_destroy_method(iscsi):
     delete_method_map = {'iscsi_create_portal_group': "iscsi_delete_portal_group",
-                         'add_initiator_group': "delete_initiator_group",
+                         'iscsi_create_initiator_group': "delete_initiator_group",
                          'iscsi_create_target_node': "delete_target_node",
                          'iscsi_set_options': None
                          }
diff --git a/test/json_config/json_config.sh b/test/json_config/json_config.sh
index 027bd42f3..a7a9069ee 100755
--- a/test/json_config/json_config.sh
+++ b/test/json_config/json_config.sh
@@ -299,7 +299,7 @@ function create_iscsi_subsystem_config() {
 	timing_enter $FUNCNAME
 	tgt_rpc bdev_malloc_create 64 1024 --name MallocForIscsi0
 	tgt_rpc iscsi_create_portal_group $PORTAL_TAG 127.0.0.1:$ISCSI_PORT
-	tgt_rpc add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
+	tgt_rpc iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
 	tgt_rpc iscsi_create_target_node Target3 Target3_alias 'MallocForIscsi0:0' $PORTAL_TAG:$INITIATOR_TAG 64 -d
 	timing_exit $FUNCNAME
 }