diff --git a/src/test/diag/dockerContainers.json b/src/test/diag/dockerContainers.json
index a705eae..13c29c3 100644
--- a/src/test/diag/dockerContainers.json
+++ b/src/test/diag/dockerContainers.json
@@ -82,7 +82,7 @@
         "onoscord_xos-onos_1",
         "onosfabric_xos-onos_1"
     ],
-    "docker-containers-mcord":
+    "docker-containers-mcord-ng40":
     [
         "allocator",
         "generator",
diff --git a/src/test/diag/onosApps.json b/src/test/diag/onosApps.json
index 4a5c74d..5ea01d7 100644
--- a/src/test/diag/onosApps.json
+++ b/src/test/diag/onosApps.json
@@ -69,7 +69,7 @@
         "org.opencord.config",
         "org.opencord.vtn"
     ],
-    "onos-fabric-mcord":
+    "onos-fabric-mcord-ng40":
     [
         "org.onosproject.drivers",
         "org.onosproject.optical-model",
@@ -79,7 +79,7 @@
         "org.onosproject.lldpprovider",
         "org.onosproject.openflow"
     ],
-    "onos-cord-mcord":
+    "onos-cord-mcord-ng40":
     [
         "org.onosproject.drivers",
         "org.onosproject.optical-model",