diff --git a/modules/tests/support/model_based/IBC.cfg b/modules/tests/support/model_based/IBC.cfg
index b9ed63584a..73976184c4 100644
--- a/modules/tests/support/model_based/IBC.cfg
+++ b/modules/tests/support/model_based/IBC.cfg
@@ -1,5 +1,5 @@
 CONSTANTS
-    ChainIds = {"chain-A", "chain-B"}
+    ChainIds = {"chainA-0", "chainB-0"}
     MaxClientsPerChain = 1
     MaxClientHeight = 2
 
diff --git a/modules/tests/support/model_based/IBCTests.cfg b/modules/tests/support/model_based/IBCTests.cfg
index a499c75463..e4c28bc288 100644
--- a/modules/tests/support/model_based/IBCTests.cfg
+++ b/modules/tests/support/model_based/IBCTests.cfg
@@ -1,5 +1,5 @@
 CONSTANTS
-    ChainIds = {"chain-A", "chain-B"}
+    ChainIds = {"chainA-0", "chainB-0"}
     MaxClientsPerChain = 1
     MaxClientHeight = 2
 
diff --git a/modules/tests/support/model_based/tests/ICS02HeaderVerificationFailureTest.json b/modules/tests/support/model_based/tests/ICS02HeaderVerificationFailureTest.json
index e19671052a..32a85c138a 100644
--- a/modules/tests/support/model_based/tests/ICS02HeaderVerificationFailureTest.json
+++ b/modules/tests/support/model_based/tests/ICS02HeaderVerificationFailureTest.json
@@ -5,43 +5,43 @@
         },
         "actionOutcome": "None",
         "chains": {
-            "chain-A": {
+            "chainA-0": {
                 "height": 0
             },
-            "chain-B": {
+            "chainB-0": {
                 "height": 0
             }
         }
     },
     {
         "action": {
-            "chainId": "chain-B",
+            "chainId": "chainB-0",
             "clientHeight": 1,
             "type": "ICS02CreateClient"
         },
         "actionOutcome": "ICS02CreateOK",
         "chains": {
-            "chain-A": {
+            "chainA-0": {
                 "height": 0
             },
-            "chain-B": {
+            "chainB-0": {
                 "height": 1
             }
         }
     },
     {
         "action": {
-            "chainId": "chain-B",
+            "chainId": "chainB-0",
             "clientHeight": 1,
             "clientId": 0,
             "type": "ICS02UpdateClient"
         },
         "actionOutcome": "ICS02HeaderVerificationFailure",
         "chains": {
-            "chain-A": {
+            "chainA-0": {
                 "height": 0
             },
-            "chain-B": {
+            "chainB-0": {
                 "height": 1
             }
         }
diff --git a/modules/tests/support/model_based/tests/ICS02UpdateOKTest.json b/modules/tests/support/model_based/tests/ICS02UpdateOKTest.json
index 86f427443f..5275bfcda3 100644
--- a/modules/tests/support/model_based/tests/ICS02UpdateOKTest.json
+++ b/modules/tests/support/model_based/tests/ICS02UpdateOKTest.json
@@ -5,109 +5,109 @@
         },
         "actionOutcome": "None",
         "chains": {
-            "chain-A": {
+            "chainA-0": {
                 "height": 0
             },
-            "chain-B": {
+            "chainB-0": {
                 "height": 0
             }
         }
     },
     {
         "action": {
-            "chainId": "chain-B",
+            "chainId": "chainB-0",
             "clientHeight": 1,
             "type": "ICS02CreateClient"
         },
         "actionOutcome": "ICS02CreateOK",
         "chains": {
-            "chain-A": {
+            "chainA-0": {
                 "height": 0
             },
-            "chain-B": {
+            "chainB-0": {
                 "height": 1
             }
         }
     },
     {
         "action": {
-            "chainId": "chain-B",
+            "chainId": "chainB-0",
             "clientHeight": 2,
             "clientId": 0,
             "type": "ICS02UpdateClient"
         },
         "actionOutcome": "ICS02UpdateOK",
         "chains": {
-            "chain-A": {
+            "chainA-0": {
                 "height": 0
             },
-            "chain-B": {
+            "chainB-0": {
                 "height": 2
             }
         }
     },
     {
         "action": {
-            "chainId": "chain-A",
+            "chainId": "chainA-0",
             "clientHeight": 1,
             "type": "ICS02CreateClient"
         },
         "actionOutcome": "ICS02CreateOK",
         "chains": {
-            "chain-A": {
+            "chainA-0": {
                 "height": 1
             },
-            "chain-B": {
+            "chainB-0": {
                 "height": 2
             }
         }
     },
     {
         "action": {
-            "chainId": "chain-A",
+            "chainId": "chainA-0",
             "clientHeight": 2,
             "clientId": 0,
             "type": "ICS02UpdateClient"
         },
         "actionOutcome": "ICS02UpdateOK",
         "chains": {
-            "chain-A": {
+            "chainA-0": {
                 "height": 2
             },
-            "chain-B": {
+            "chainB-0": {
                 "height": 2
             }
         }
     },
     {
         "action": {
-            "chainId": "chain-A",
+            "chainId": "chainA-0",
             "clientHeight": 1,
             "type": "ICS02CreateClient"
         },
         "actionOutcome": "ICS02CreateOK",
         "chains": {
-            "chain-A": {
+            "chainA-0": {
                 "height": 3
             },
-            "chain-B": {
+            "chainB-0": {
                 "height": 2
             }
         }
     },
     {
         "action": {
-            "chainId": "chain-A",
+            "chainId": "chainA-0",
             "clientHeight": 2,
             "clientId": 1,
             "type": "ICS02UpdateClient"
         },
         "actionOutcome": "ICS02UpdateOK",
         "chains": {
-            "chain-A": {
+            "chainA-0": {
                 "height": 4
             },
-            "chain-B": {
+            "chainB-0": {
                 "height": 2
             }
         }