diff --git a/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java b/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java
index 72fc13f..2d0063e 100644
--- a/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java
+++ b/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java
@@ -166,7 +166,7 @@
             },
             new ConfigFactory<ApplicationId, NetconfProviderConfig>(APP_SUBJECT_FACTORY,
                                                                     NetconfProviderConfig.class,
-                                                                    "devices",
+                                                                    "netconf_devices",
                                                                     true) {
                 @Override
                 public NetconfProviderConfig createConfig() {
diff --git a/providers/rest/device/src/main/java/org/onosproject/provider/rest/device/impl/RestDeviceProvider.java b/providers/rest/device/src/main/java/org/onosproject/provider/rest/device/impl/RestDeviceProvider.java
index e628a4e..ec5f247 100644
--- a/providers/rest/device/src/main/java/org/onosproject/provider/rest/device/impl/RestDeviceProvider.java
+++ b/providers/rest/device/src/main/java/org/onosproject/provider/rest/device/impl/RestDeviceProvider.java
@@ -129,7 +129,7 @@
     protected final List<ConfigFactory> factories = ImmutableList.of(
             new ConfigFactory<ApplicationId, RestProviderConfig>(APP_SUBJECT_FACTORY,
                                                                  RestProviderConfig.class,
-                                                                 "devices",
+                                                                 "rest_devices",
                                                                  true) {
                 @Override
                 public RestProviderConfig createConfig() {
diff --git a/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/SnmpDeviceProvider.java b/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/SnmpDeviceProvider.java
index fb77c70..c4ad21d 100644
--- a/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/SnmpDeviceProvider.java
+++ b/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/SnmpDeviceProvider.java
@@ -109,7 +109,7 @@
     protected final List<ConfigFactory> factories = ImmutableList.of(
             new ConfigFactory<ApplicationId, SnmpProviderConfig>(APP_SUBJECT_FACTORY,
                                                                  SnmpProviderConfig.class,
-                                                                 "devices",
+                                                                 "snmp_devices",
                                                                  true) {
                 @Override
                 public SnmpProviderConfig createConfig() {
diff --git a/tools/test/configs/bmv2-cfg.json b/tools/test/configs/bmv2-cfg.json
index 20f4010..dc71153 100644
--- a/tools/test/configs/bmv2-cfg.json
+++ b/tools/test/configs/bmv2-cfg.json
@@ -1,7 +1,7 @@
 {
   "apps":{
     "org.onosproject.bmv2":{
-      "devices":[{
+      "bmv2_devices":[{
         "ip":"192.168.57.100",
         "port":9090
       }]
diff --git a/tools/test/configs/netconf-cfg-old.json b/tools/test/configs/netconf-cfg-old.json
index e9910b4..e80aa50 100644
--- a/tools/test/configs/netconf-cfg-old.json
+++ b/tools/test/configs/netconf-cfg-old.json
@@ -8,7 +8,7 @@
   },
   "apps":{
     "org.onosproject.netconf":{
-      "devices":[{
+      "netconf_devices":[{
         "username":"mininet",
         "password":"mininet",
         "ip":"192.168.56.104",
diff --git a/tools/test/configs/restSB-cfg-old.json b/tools/test/configs/restSB-cfg-old.json
index f7aa152..9d1181e 100644
--- a/tools/test/configs/restSB-cfg-old.json
+++ b/tools/test/configs/restSB-cfg-old.json
@@ -8,7 +8,7 @@
   },
   "apps": {
     "org.onosproject.restsb": {
-      "devices": [{
+      "rest_devices": [{
         "username": "dev",
         "password": "",
         "ip": "127.0.0.1",