diff --git a/examples/src/main/java/io/dapr/examples/exception/README.md b/examples/src/main/java/io/dapr/examples/exception/README.md
index da6d6d356..52a53fbe9 100644
--- a/examples/src/main/java/io/dapr/examples/exception/README.md
+++ b/examples/src/main/java/io/dapr/examples/exception/README.md
@@ -74,7 +74,7 @@ sleep: 5
 -->
 
 ```bash
-dapr run --app-id exception_example -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.exception.Client
+dapr run --app-id exception-example -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.exception.Client
 ```
 
 <!-- END_STEP -->
@@ -124,7 +124,7 @@ name: Cleanup
 -->
 
 ```bash
-dapr stop --app-id exception_example
+dapr stop --app-id exception-example
 ```
 
 <!-- END_STEP -->
\ No newline at end of file
diff --git a/examples/src/main/java/io/dapr/examples/pubsub/http/PublisherWithTracing.java b/examples/src/main/java/io/dapr/examples/pubsub/http/PublisherWithTracing.java
index 61f534d66..4c8aca09f 100644
--- a/examples/src/main/java/io/dapr/examples/pubsub/http/PublisherWithTracing.java
+++ b/examples/src/main/java/io/dapr/examples/pubsub/http/PublisherWithTracing.java
@@ -30,7 +30,7 @@ import static io.dapr.examples.OpenTelemetryConfig.getReactorContext;
  * mvn clean install
  * 2. cd [repo root]/examples
  * 3. Run the program:
- * dapr run --components-path ./components/pubsub --app-id publisher_tracing -- \
+ * dapr run --components-path ./components/pubsub --app-id publisher-tracing -- \
  * java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.http.PublisherWithTracing
  */
 public class PublisherWithTracing {
diff --git a/examples/src/main/java/io/dapr/examples/pubsub/http/README.md b/examples/src/main/java/io/dapr/examples/pubsub/http/README.md
index 0d25dee86..206cdc9f8 100644
--- a/examples/src/main/java/io/dapr/examples/pubsub/http/README.md
+++ b/examples/src/main/java/io/dapr/examples/pubsub/http/README.md
@@ -272,7 +272,7 @@ sleep: 15
 -->
 
 ```bash
-dapr run --components-path ./components/pubsub --app-id publisher_tracing -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.http.PublisherWithTracing
+dapr run --components-path ./components/pubsub --app-id publisher-tracing -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.http.PublisherWithTracing
 ```
 
 <!-- END_STEP -->
diff --git a/examples/src/main/java/io/dapr/examples/querystate/README.md b/examples/src/main/java/io/dapr/examples/querystate/README.md
index 03c6e800a..4a8655fc9 100644
--- a/examples/src/main/java/io/dapr/examples/querystate/README.md
+++ b/examples/src/main/java/io/dapr/examples/querystate/README.md
@@ -239,7 +239,7 @@ sleep: 10
 
 Run this example with the following command:
 ```bash
-dapr run --components-path ./components/state --app-id query_state_example -H 3600 -- java -Ddapr.api.protocol=HTTP -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.querystate.QuerySavedState
+dapr run --components-path ./components/state --app-id query-state-example -H 3600 -- java -Ddapr.api.protocol=HTTP -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.querystate.QuerySavedState
 ```
 
 <!-- END_STEP -->
@@ -273,7 +273,7 @@ name: Cleanup
 -->
 
 ```bash
-dapr stop --app-id query_state_example
+dapr stop --app-id query-state-example
 ```
 
 <!-- END_STEP -->
diff --git a/examples/src/main/java/io/dapr/examples/state/README.md b/examples/src/main/java/io/dapr/examples/state/README.md
index f9b5f4a57..7d8002067 100644
--- a/examples/src/main/java/io/dapr/examples/state/README.md
+++ b/examples/src/main/java/io/dapr/examples/state/README.md
@@ -162,7 +162,7 @@ sleep: 5
 
 Run this example with the following command:
 ```bash
-dapr run --components-path ./components/state --app-id state_example -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.state.StateClient 'my message'
+dapr run --components-path ./components/state --app-id state-example -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.state.StateClient 'my message'
 ```
 
 <!-- END_STEP -->
@@ -198,7 +198,7 @@ name: Cleanup
 -->
 
 ```bash
-dapr stop --app-id state_example
+dapr stop --app-id state-example
 ```
 
 <!-- END_STEP -->
diff --git a/examples/src/main/java/io/dapr/examples/tracing/README.md b/examples/src/main/java/io/dapr/examples/tracing/README.md
index a75b52374..c62599182 100644
--- a/examples/src/main/java/io/dapr/examples/tracing/README.md
+++ b/examples/src/main/java/io/dapr/examples/tracing/README.md
@@ -283,7 +283,7 @@ sleep: 20
 -->
 
 ```bash
-dapr run -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.tracing.InvokeClient "message one" "message two"
+dapr run --app-id tracingdemoclient -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.tracing.InvokeClient "message one" "message two"
 ```
 
 <!-- END_STEP -->
diff --git a/sdk-tests/src/test/java/io/dapr/it/DaprRun.java b/sdk-tests/src/test/java/io/dapr/it/DaprRun.java
index 13b0f901c..fb69c9687 100644
--- a/sdk-tests/src/test/java/io/dapr/it/DaprRun.java
+++ b/sdk-tests/src/test/java/io/dapr/it/DaprRun.java
@@ -58,7 +58,9 @@ public class DaprRun implements Stoppable {
                   DaprApiProtocol protocol,
                   DaprApiProtocol appProtocol) {
     // The app name needs to be deterministic since we depend on it to kill previous runs.
-    this.appName = serviceClass == null ? testName : String.format("%s_%s", testName, serviceClass.getSimpleName());
+    this.appName = serviceClass == null ?
+        testName.toLowerCase() :
+        String.format("%s-%s", testName, serviceClass.getSimpleName()).toLowerCase();
     this.startCommand =
         new Command(successMessage, buildDaprCommand(this.appName, serviceClass, ports, protocol, appProtocol));
     this.listCommand = new Command(
diff --git a/sdk-tests/src/test/java/io/dapr/it/tracing/grpc/TracingIT.java b/sdk-tests/src/test/java/io/dapr/it/tracing/grpc/TracingIT.java
index a40874f92..7e604f357 100644
--- a/sdk-tests/src/test/java/io/dapr/it/tracing/grpc/TracingIT.java
+++ b/sdk-tests/src/test/java/io/dapr/it/tracing/grpc/TracingIT.java
@@ -86,6 +86,6 @@ public class TracingIT extends BaseIT {
         span.end();
         OpenTelemetrySdk.getGlobalTracerManagement().shutdown();
 
-        Validation.validate(spanName, "calllocal/tracingit_service/sleepovergrpc");
+        Validation.validate(spanName, "calllocal/tracingit-service/sleepovergrpc");
     }
 }
diff --git a/sdk-tests/src/test/java/io/dapr/it/tracing/http/TracingIT.java b/sdk-tests/src/test/java/io/dapr/it/tracing/http/TracingIT.java
index 4752be1d5..a9301966f 100644
--- a/sdk-tests/src/test/java/io/dapr/it/tracing/http/TracingIT.java
+++ b/sdk-tests/src/test/java/io/dapr/it/tracing/http/TracingIT.java
@@ -83,7 +83,7 @@ public class TracingIT extends BaseIT {
         span.end();
         OpenTelemetrySdk.getGlobalTracerManagement().shutdown();
 
-        Validation.validate(spanName, "calllocal/tracingit_service/sleep");
+        Validation.validate(spanName, "calllocal/tracingit-service/sleep");
     }
 
 }