diff --git a/pub_sub/csharp/http/README.md b/pub_sub/csharp/http/README.md
index f2cd2d1c..ec280346 100644
--- a/pub_sub/csharp/http/README.md
+++ b/pub_sub/csharp/http/README.md
@@ -46,7 +46,7 @@ sleep: 10
 
 
 ```bash
-dapr run --app-id order-processor --components-path ../../../components/ --app-port 7001 -- dotnet run --project .
+dapr run --app-id order-processor-http --components-path ../../../components/ --app-port 7001 -- dotnet run --project .
 ```
 
 <!-- END_STEP -->
@@ -82,11 +82,12 @@ sleep: 10
 -->
     
 ```bash
-dapr run --app-id checkout --components-path ../../../components/ -- dotnet run --project .
+dapr run --app-id checkout-http --components-path ../../../components/ -- dotnet run --project .
 ```
 
 <!-- END_STEP -->
 
 ```bash
-dapr stop --app-id order-processor
+dapr stop --app-id order-processor-http
+dapr stop --app-id checkout-http
 ```
diff --git a/pub_sub/csharp/sdk/README.md b/pub_sub/csharp/sdk/README.md
index a30a43b6..7cbc08be 100644
--- a/pub_sub/csharp/sdk/README.md
+++ b/pub_sub/csharp/sdk/README.md
@@ -46,7 +46,7 @@ sleep: 10
 
 
 ```bash
-dapr run --app-id order-processor --components-path ../../../components/ --app-port 7001 -- dotnet run --project .
+dapr run --app-id order-processor-sdk --components-path ../../../components/ --app-port 7002 -- dotnet run --project .
 ```
 
 <!-- END_STEP -->
@@ -82,11 +82,12 @@ sleep: 10
 -->
     
 ```bash
-dapr run --app-id checkout --components-path ../../../components/ -- dotnet run --project .
+dapr run --app-id checkout-sdk --components-path ../../../components/ -- dotnet run --project .
 ```
 
 <!-- END_STEP -->
 
 ```bash
-dapr stop --app-id order-processor
+dapr stop --app-id order-processor-sdk
+dapr stop --app-id checkout-sdk
 ```
diff --git a/pub_sub/csharp/sdk/order-processor/Properties/launchSettings.json b/pub_sub/csharp/sdk/order-processor/Properties/launchSettings.json
index 13b85e68..c7ab1720 100644
--- a/pub_sub/csharp/sdk/order-processor/Properties/launchSettings.json
+++ b/pub_sub/csharp/sdk/order-processor/Properties/launchSettings.json
@@ -6,7 +6,7 @@
       "dotnetRunMessages": "true",
       "launchBrowser": true,
       "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:7001",
+      "applicationUrl": "http://localhost:7002",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/pub_sub/go/http/README.md b/pub_sub/go/http/README.md
index c7117b2d..7c11d4ae 100644
--- a/pub_sub/go/http/README.md
+++ b/pub_sub/go/http/README.md
@@ -44,7 +44,7 @@ sleep: 15
 
 ```bash
 cd ./order-processor
-dapr run --app-port 6002 --app-id order-processor --app-protocol http --dapr-http-port 3501 --components-path ../../../components -- go run .
+dapr run --app-port 6001 --app-id order-processor --app-protocol http --dapr-http-port 3501 --components-path ../../../components -- go run .
 ```
 
 <!-- END_STEP -->
@@ -78,12 +78,12 @@ sleep: 15
     
 ```bash
 cd ./checkout
-dapr run --app-id checkout --app-protocol http --dapr-http-port 3500 --components-path ../../../components -- go run .
+dapr run --app-id checkout-http --app-protocol http --dapr-http-port 3500 --components-path ../../../components -- go run .
 ```
 
 <!-- END_STEP -->
 
 ```bash
-dapr stop --app-id checkout
+dapr stop --app-id checkout-http
 dapr stop --app-id order-processor
 ```
diff --git a/pub_sub/go/http/checkout/dapr_example b/pub_sub/go/http/checkout/dapr_example
index e073f82e..f7eb3336 100755
Binary files a/pub_sub/go/http/checkout/dapr_example and b/pub_sub/go/http/checkout/dapr_example differ
diff --git a/pub_sub/go/http/order-processor/app.go b/pub_sub/go/http/order-processor/app.go
index 9acfca95..5e2415f8 100644
--- a/pub_sub/go/http/order-processor/app.go
+++ b/pub_sub/go/http/order-processor/app.go
@@ -61,7 +61,7 @@ func postOrder(w http.ResponseWriter, r *http.Request) {
 }
 
 func main() {
-	appPort := "6002"
+	appPort := "6001"
 	if value, ok := os.LookupEnv("APP_PORT"); ok {
 		appPort = value
 	}
diff --git a/pub_sub/go/http/order-processor/dapr_example b/pub_sub/go/http/order-processor/dapr_example
index e7b0ea9b..10b7f109 100755
Binary files a/pub_sub/go/http/order-processor/dapr_example and b/pub_sub/go/http/order-processor/dapr_example differ
diff --git a/pub_sub/go/sdk/README.md b/pub_sub/go/sdk/README.md
index ba9257ce..6f2f3614 100644
--- a/pub_sub/go/sdk/README.md
+++ b/pub_sub/go/sdk/README.md
@@ -43,7 +43,7 @@ sleep: 15
 
 ```bash
 cd ./order-processor
-dapr run --app-port 6001 --app-id order-processor --app-protocol http --dapr-http-port 3501 --components-path ../../../components -- go run .
+dapr run --app-port 6002 --app-id order-processor-sdk --app-protocol http --dapr-http-port 3501 --components-path ../../../components -- go run .
 ```
 
 <!-- END_STEP -->
@@ -77,12 +77,12 @@ sleep: 15
     
 ```bash
 cd ./checkout
-dapr run --app-id checkout --app-protocol http --dapr-http-port 3500 --components-path ../../../components -- go run .
+dapr run --app-id checkout-sdk --app-protocol http --dapr-http-port 3500 --components-path ../../../components -- go run .
 ```
 
 <!-- END_STEP -->
 
 ```bash
-dapr stop --app-id checkout
-dapr stop --app-id order-processor
+dapr stop --app-id checkout-sdk
+dapr stop --app-id order-processor-sdk
 ```
diff --git a/pub_sub/go/sdk/checkout/dapr_example b/pub_sub/go/sdk/checkout/dapr_example
index 273a2fa7..fc8bbe52 100755
Binary files a/pub_sub/go/sdk/checkout/dapr_example and b/pub_sub/go/sdk/checkout/dapr_example differ
diff --git a/pub_sub/go/sdk/order-processor/app.go b/pub_sub/go/sdk/order-processor/app.go
index af4f160c..383008b0 100644
--- a/pub_sub/go/sdk/order-processor/app.go
+++ b/pub_sub/go/sdk/order-processor/app.go
@@ -18,7 +18,7 @@ var sub = &common.Subscription{
 }
 
 func main() {
-	appPort := "6001"
+	appPort := "6002"
 	if value, ok := os.LookupEnv("APP_PORT"); ok {
 		appPort = value
 	}
diff --git a/pub_sub/go/sdk/order-processor/dapr_example b/pub_sub/go/sdk/order-processor/dapr_example
index 9fba6cdd..edb184b0 100755
Binary files a/pub_sub/go/sdk/order-processor/dapr_example and b/pub_sub/go/sdk/order-processor/dapr_example differ
diff --git a/pub_sub/java/http/README.md b/pub_sub/java/http/README.md
index 484ae94d..00ff1c61 100644
--- a/pub_sub/java/http/README.md
+++ b/pub_sub/java/http/README.md
@@ -50,7 +50,7 @@ sleep: 10
 -->
 ```bash
 cd ./order-processor
- dapr run --app-port 8080 --app-id order-processor --components-path ../../../components -- java -jar target/OrderProcessingService-0.0.1-SNAPSHOT.jar
+ dapr run --app-port 8080 --app-id order-processor-http --components-path ../../../components -- java -jar target/OrderProcessingService-0.0.1-SNAPSHOT.jar
 ```
 <!-- END_STEP -->
 ### Run Java message publisher app with Dapr
@@ -83,11 +83,11 @@ sleep: 10
 
 ```bash
 cd ./checkout
- dapr run --app-id checkout --components-path ../../../components -- java -jar target/CheckoutService-0.0.1-SNAPSHOT.jar
+ dapr run --app-id checkout-http --components-path ../../../components -- java -jar target/CheckoutService-0.0.1-SNAPSHOT.jar
 ```
 <!-- END_STEP -->
 
 ```bash
-dapr stop --app-id checkout
-dapr stop --app-id order-processor
+dapr stop --app-id checkout-http
+dapr stop --app-id order-processor-http
 ```
diff --git a/pub_sub/java/sdk/README.md b/pub_sub/java/sdk/README.md
index 1986b36c..b90266d6 100644
--- a/pub_sub/java/sdk/README.md
+++ b/pub_sub/java/sdk/README.md
@@ -50,7 +50,7 @@ sleep: 10
 -->
 ```bash
 cd ./order-processor
- dapr run --app-port 8080 --app-id order-processor --components-path ../../../components -- java -jar target/OrderProcessingService-0.0.1-SNAPSHOT.jar
+ dapr run --app-port 8080 --app-id order-processor-sdk --components-path ../../../components -- java -jar target/OrderProcessingService-0.0.1-SNAPSHOT.jar
 ```
 <!-- END_STEP -->
 
@@ -84,11 +84,11 @@ sleep: 10
 
 ```bash
 cd ./checkout
-dapr run --app-id checkout --components-path ../../../components -- java -jar target/CheckoutService-0.0.1-SNAPSHOT.jar
+dapr run --app-id checkout-sdk --components-path ../../../components -- java -jar target/CheckoutService-0.0.1-SNAPSHOT.jar
 ```
 <!-- END_STEP -->
 
 ```bash
-dapr stop --app-id checkout
-dapr stop --app-id order-processor
+dapr stop --app-id checkout-sdk
+dapr stop --app-id order-processor-sdk
 ```
diff --git a/pub_sub/javascript/http/README.md b/pub_sub/javascript/http/README.md
index 0543577b..d24585ac 100644
--- a/pub_sub/javascript/http/README.md
+++ b/pub_sub/javascript/http/README.md
@@ -42,7 +42,7 @@ sleep: 10
 -->
     
 ```bash
-dapr run --app-id checkout --components-path ../../../components/  --app-port 5001 -- node .
+dapr run --app-id order-processor-http --components-path ../../../components/  --app-port 5001 -- node .
 ```
 
 <!-- END_STEP -->
@@ -76,12 +76,12 @@ sleep: 10
 -->
     
 ```bash
-dapr run --app-id checkout --components-path ../../../components/  --app-port 5001 -- node .
+dapr run --app-id checkout-http --components-path ../../../components/  --app-port 5001 -- node .
 ```
 
 <!-- END_STEP -->
 
 ```bash
-dapr stop --app-id checkout
-dapr stop --app-id order-processor
+dapr stop --app-id checkout-http
+dapr stop --app-id order-processor-http
 ```
diff --git a/pub_sub/javascript/sdk/README.md b/pub_sub/javascript/sdk/README.md
index 39a05f5b..7ba92b29 100644
--- a/pub_sub/javascript/sdk/README.md
+++ b/pub_sub/javascript/sdk/README.md
@@ -42,7 +42,7 @@ sleep: 10
 -->
     
 ```bash
-dapr run --app-port 5001 --app-id order-processing --app-protocol http --dapr-http-port 3501 --components-path ../../../components -- npm run start
+dapr run --app-port 5002 --app-id order-processing-sdk --app-protocol http --dapr-http-port 3501 --components-path ../../../components -- npm run start
 ```
 
 <!-- END_STEP -->
@@ -76,12 +76,12 @@ sleep: 10
 -->
     
 ```bash
-dapr run --app-id checkout --app-protocol http --dapr-http-port 3500 --components-path ../../../components -- npm run start
+dapr run --app-id checkout-sdk --app-protocol http --dapr-http-port 3500 --components-path ../../../components -- npm run start
 ```
 
 <!-- END_STEP -->
 
 ```bash
-dapr stop --app-id checkout
-dapr stop --app-id order-processor
+dapr stop --app-id checkout-sdk
+dapr stop --app-id order-processor-sdk
 ```
diff --git a/pub_sub/javascript/sdk/order-processor/index.js b/pub_sub/javascript/sdk/order-processor/index.js
index 7bd50a3b..8a1bd9f1 100644
--- a/pub_sub/javascript/sdk/order-processor/index.js
+++ b/pub_sub/javascript/sdk/order-processor/index.js
@@ -3,7 +3,7 @@ import { DaprServer } from '@dapr/dapr';
 const DAPR_HOST = process.env.DAPR_HOST || "http://localhost";
 const DAPR_HTTP_PORT = process.env.DAPR_HTTP_PORT || "3501";
 const SERVER_HOST = process.env.SERVER_HOST || "127.0.0.1";
-const SERVER_PORT = process.env.APP_PORT || 5001;
+const SERVER_PORT = process.env.APP_PORT || 5002;
 
 async function main() {
   const server = new DaprServer(SERVER_HOST, SERVER_PORT, DAPR_HOST, DAPR_HTTP_PORT);
diff --git a/pub_sub/python/http/README.md b/pub_sub/python/http/README.md
index d24c59f9..1f6c36cc 100644
--- a/pub_sub/python/http/README.md
+++ b/pub_sub/python/http/README.md
@@ -43,7 +43,7 @@ sleep: 10
 
 
 ```bash
-dapr run --app-id order-processor --components-path ../../../components/ --app-port 6001 -- python3 app.py
+dapr run --app-id order-processor-http --components-path ../../../components/ --app-port 6001 -- python3 app.py
 ```
 
 <!-- END_STEP -->
@@ -77,12 +77,12 @@ sleep: 10
 -->
     
 ```bash
-dapr run --app-id checkout --components-path ../../../components/ -- python3 app.py
+dapr run --app-id checkout-http --components-path ../../../components/ -- python3 app.py
 ```
 
 <!-- END_STEP -->
 
 ```bash
-dapr stop --app-id checkout
-dapr stop --app-id order-processor
+dapr stop --app-id checkout-http
+dapr stop --app-id order-processor-http
 ```
diff --git a/pub_sub/python/sdk/README.md b/pub_sub/python/sdk/README.md
index f4d8e510..8c84eea5 100644
--- a/pub_sub/python/sdk/README.md
+++ b/pub_sub/python/sdk/README.md
@@ -42,7 +42,7 @@ sleep: 10
 -->
 
 ```bash
-dapr run --app-id order-processor --components-path ../../../components/ --app-port 6001 -- uvicorn app:app --port 6001
+dapr run --app-id order-processor-sdk --components-path ../../../components/ --app-port 6001 -- uvicorn app:app --port 6002
 ```
 
 <!-- END_STEP -->
@@ -77,12 +77,12 @@ sleep: 10
 -->
 
 ```bash
-dapr run --app-id checkout --components-path ../../../components/ -- python3 app.py
+dapr run --app-id checkout-sdk --components-path ../../../components/ -- python3 app.py
 ```
 
 <!-- END_STEP -->
 
 ```bash
-dapr stop --app-id checkout
-dapr stop --app-id order-processor
+dapr stop --app-id checkout-sdk
+dapr stop --app-id order-processor-sdk
 ```
diff --git a/pub_sub/python/sdk/order-processor/app.py b/pub_sub/python/sdk/order-processor/app.py
index f2212c0a..6a5a3628 100644
--- a/pub_sub/python/sdk/order-processor/app.py
+++ b/pub_sub/python/sdk/order-processor/app.py
@@ -5,7 +5,7 @@ import os
 
 app = Flask(__name__)
 
-app_port = os.getenv('APP_PORT', '6001')
+app_port = os.getenv('APP_PORT', '6002')
 
 # Register Dapr pub/sub subscriptions
 @app.route('/dapr/subscribe', methods=['GET'])