diff --git a/Attribution.txt b/Attribution.txt
index 40021b2e..6311e84e 100644
--- a/Attribution.txt
+++ b/Attribution.txt
@@ -142,4 +142,7 @@ github.com/go-playground/validator/v10 (MIT) https://github.com/go-playground/va
 https://github.com/go-playground/validator/blob/master/LICENSE
 
 leodido/go-urn (MIT) https://github.com/leodido/go-urn
-https://github.com/leodido/go-urn
\ No newline at end of file
+https://github.com/leodido/go-urn
+
+gopkg.in/yaml.v2 (Apache 2.0) https://github.com/go-yaml/yaml/
+https://github.com/go-yaml/yaml/blob/v2.2.2/LICENSE
diff --git a/go.mod b/go.mod
index d25f2502..8b2ab46c 100644
--- a/go.mod
+++ b/go.mod
@@ -2,4 +2,4 @@ module github.com/edgexfoundry/app-service-configurable
 
 go 1.15
 
-require github.com/edgexfoundry/app-functions-sdk-go/v2 v2.0.0-dev.4
+require github.com/edgexfoundry/app-functions-sdk-go/v2 v2.0.0-dev.7
diff --git a/res/http-export/configuration.toml b/res/http-export/configuration.toml
index e505eb41..6caf0a68 100644
--- a/res/http-export/configuration.toml
+++ b/res/http-export/configuration.toml
@@ -115,8 +115,8 @@ Timeout = "30s"
   Port = 48080
 
 [Binding]
-Type="messagebus"
-SubscribeTopics="events"
+Type="edgex-messagebus"
+SubscribeTopics="events, edgex/events"
 
 [MessageBus]
 Type = "zero"
diff --git a/res/mqtt-export/configuration.toml b/res/mqtt-export/configuration.toml
index 39d2a8b7..ee10344d 100644
--- a/res/mqtt-export/configuration.toml
+++ b/res/mqtt-export/configuration.toml
@@ -113,8 +113,8 @@ Timeout = "30s"
   Port = 48080
 
 [Binding]
-Type="messagebus"
-SubscribeTopics="events"
+Type="edgex-messagebus"
+SubscribeTopics="events, edgex/events"
 
 [MessageBus]
 Type = "zero"
diff --git a/res/rules-engine-mqtt/configuration.toml b/res/rules-engine-mqtt/configuration.toml
index 1b82a13f..f5c76237 100644
--- a/res/rules-engine-mqtt/configuration.toml
+++ b/res/rules-engine-mqtt/configuration.toml
@@ -38,8 +38,8 @@ Type = "consul"
   Port = 48080
 
 [Binding]
-Type="messagebus"
-SubscribeTopics="events"
+Type="edgex-messagebus"
+SubscribeTopics="events, edgex/events/#"
 PublishTopic="rules-events"
 
 [MessageBus]
diff --git a/res/rules-engine-redis/configuration.toml b/res/rules-engine-redis/configuration.toml
index 1de2a6b5..b55c8ba9 100644
--- a/res/rules-engine-redis/configuration.toml
+++ b/res/rules-engine-redis/configuration.toml
@@ -73,8 +73,8 @@ RetryWaitPeriod = "1s"
   AuthType = 'X-Vault-Token'
 
 [Binding]
-Type="messagebus"
-SubscribeTopics="events"
+Type="edgex-messagebus"
+SubscribeTopics="events, edgex/events"
 PublishTopic="rules-events"
 
 [MessageBus]
diff --git a/res/rules-engine/configuration.toml b/res/rules-engine/configuration.toml
index 3fa6fc77..3ab748d1 100644
--- a/res/rules-engine/configuration.toml
+++ b/res/rules-engine/configuration.toml
@@ -38,8 +38,8 @@ Type = "consul"
   Port = 48080
 
 [Binding]
-Type="messagebus"
-SubscribeTopics="events"
+Type="edgex-messagebus"
+SubscribeTopics="events, edgex/events"
 PublishTopic="rules-events"
 
 [MessageBus]
diff --git a/res/sample/configuration.toml b/res/sample/configuration.toml
index ea1b8683..6286695c 100644
--- a/res/sample/configuration.toml
+++ b/res/sample/configuration.toml
@@ -195,8 +195,8 @@ Timeout = "30s"
   Port = 48080
 
 [Binding]
-Type="messagebus"
-SubscribeTopics="events"
+Type="edgex-messagebus"
+SubscribeTopics="events, edgex/events"
 PublishTopic="example"
 
 [MessageBus]