diff --git a/core/store/dist/src/main/resource/org/onosproject/store/flow/impl/DistributedFlowRuleStore.cfgdef b/core/store/dist/src/main/resources/org/onosproject/store/flow/impl/DistributedFlowRuleStore.cfgdef
similarity index 100%
rename from core/store/dist/src/main/resource/org/onosproject/store/flow/impl/DistributedFlowRuleStore.cfgdef
rename to core/store/dist/src/main/resources/org/onosproject/store/flow/impl/DistributedFlowRuleStore.cfgdef
diff --git a/core/store/src/main/resources/org/onosproject/store/flow/impl/DistributedFlowRuleStore.cfgdef b/core/store/src/main/resources/org/onosproject/store/flow/impl/DistributedFlowRuleStore.cfgdef
deleted file mode 100644
index 7d0d6d9..0000000
--- a/core/store/src/main/resources/org/onosproject/store/flow/impl/DistributedFlowRuleStore.cfgdef
+++ /dev/null
@@ -1,3 +0,0 @@
-# Temporary: to be auto-generated in near future
-msgHandlerPoolSize|INTEGER|8|Number of threads in the message handler pool
-backupEnabled|BOOLEAN|DEFAULT_BACKUP_ENABLED|Indicates whether backups are enabled or not
diff --git a/providers/lldp/src/main/resource/org/onosproject/provider/lldp/impl/LLDPLinkProvider.cfgdef b/providers/lldp/src/main/resource/org/onosproject/provider/lldp/impl/LLDPLinkProvider.cfgdef
deleted file mode 100644
index 588e4f3..0000000
--- a/providers/lldp/src/main/resource/org/onosproject/provider/lldp/impl/LLDPLinkProvider.cfgdef
+++ /dev/null
@@ -1,4 +0,0 @@
-# Temporary: to be auto-generated in near future
-useBDDP|BOOLEAN|true|Use BDDP for link discovery
-disableLinkDiscovery|BOOLEAN|false|Permanently disable link discovery
-lldpSuppression|STRING|../config/lldp_suppression.json|Path to LLDP suppression configuration file
diff --git a/providers/null/link/src/main/java/org/onosproject/provider/nil/link/impl/NullLinkProvider.java b/providers/null/link/src/main/java/org/onosproject/provider/nil/link/impl/NullLinkProvider.java
index b819eb7..0fddce8 100644
--- a/providers/null/link/src/main/java/org/onosproject/provider/nil/link/impl/NullLinkProvider.java
+++ b/providers/null/link/src/main/java/org/onosproject/provider/nil/link/impl/NullLinkProvider.java
@@ -123,13 +123,11 @@
             Executors.newScheduledThreadPool(THREADS, groupedThreads("onos/null", "link-driver-%d"));
 
     // For flicker = true, duration between events in msec.
-    @Property(name = "eventRate", intValue = 0, label = "Duration between Link Event")
+    @Property(name = "eventRate", intValue = DEFAULT_RATE, label = "Duration between Link Event")
     private int eventRate = DEFAULT_RATE;
 
     // topology configuration file
-    @Property(name = "cfgFile",
-            value = "/opt/onos/apache-karaf-3.0.2/etc/linkGraph.cfg",
-            label = "Topology file location")
+    @Property(name = "cfgFile", value = CFG_PATH, label = "Topology file location")
     private String cfgFile = CFG_PATH;
 
     // flag checked to create a LinkDriver, if rate is non-zero.
diff --git a/providers/null/link/src/main/resource/org/onosproject/provider/nil/link/impl/NullLinkProvider.cfgdef b/providers/null/link/src/main/resources/org/onosproject/provider/nil/link/impl/NullLinkProvider.cfgdef
similarity index 100%
rename from providers/null/link/src/main/resource/org/onosproject/provider/nil/link/impl/NullLinkProvider.cfgdef
rename to providers/null/link/src/main/resources/org/onosproject/provider/nil/link/impl/NullLinkProvider.cfgdef
diff --git a/providers/null/packet/src/main/resource/org/onosproject/provider/nil/packet/impl/NullPacketProvider.cfgdef b/providers/null/packet/src/main/resources/org/onosproject/provider/nil/packet/impl/NullPacketProvider.cfgdef
similarity index 100%
rename from providers/null/packet/src/main/resource/org/onosproject/provider/nil/packet/impl/NullPacketProvider.cfgdef
rename to providers/null/packet/src/main/resources/org/onosproject/provider/nil/packet/impl/NullPacketProvider.cfgdef