diff --git a/src/workload-orchestration/azext_workload_orchestration/aaz/latest/workload_orchestration/solution_template/_delete_version.py b/src/workload-orchestration/azext_workload_orchestration/aaz/latest/workload_orchestration/solution_template/_delete_version.py
index 2311d34bdb8..1a3f3db43c0 100644
--- a/src/workload-orchestration/azext_workload_orchestration/aaz/latest/workload_orchestration/solution_template/_delete_version.py
+++ b/src/workload-orchestration/azext_workload_orchestration/aaz/latest/workload_orchestration/solution_template/_delete_version.py
@@ -13,6 +13,7 @@
 
 @register_command(
     "workload-orchestration solution-template delete-version",
+    confirmation="Are you sure you want to perform this operation?",
 )
 class DeleteVersion(AAZCommand):
     """Delete Solution Template Version Resource
diff --git a/src/workload-orchestration/azext_workload_orchestration/aaz/latest/workload_orchestration/target/_solution_instance_list.py b/src/workload-orchestration/azext_workload_orchestration/aaz/latest/workload_orchestration/target/_solution_instance_list.py
index b9b3eb5ec91..4637ca587f1 100644
--- a/src/workload-orchestration/azext_workload_orchestration/aaz/latest/workload_orchestration/target/_solution_instance_list.py
+++ b/src/workload-orchestration/azext_workload_orchestration/aaz/latest/workload_orchestration/target/_solution_instance_list.py
@@ -17,7 +17,7 @@
 class ListSolutionInstances(AAZCommand):
     """List all solution instances of a solution deployed on a target
     :example:
-        az workload-orchestration solution-instance list -g MyResourceGroup --solution-name MySolution
+        az workload-orchestration solution-instance list -g MyResourceGroup --solution-version-name MySolution
     """
 
     _aaz_info = {
@@ -56,7 +56,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             ),
         )
         _args_schema.solution_name = AAZStrArg(
-            options=["--solution-template-name", "--solution"],
+            options=["--solution-version-name", "--solution"],
             help="Name of the solution",
             required=True,
             fmt=AAZStrArgFormat(
diff --git a/src/workload-orchestration/azext_workload_orchestration/aaz/latest/workload_orchestration/target/_solution_revision_list.py b/src/workload-orchestration/azext_workload_orchestration/aaz/latest/workload_orchestration/target/_solution_revision_list.py
index 48bcb2fdc1e..dc16ada3656 100644
--- a/src/workload-orchestration/azext_workload_orchestration/aaz/latest/workload_orchestration/target/_solution_revision_list.py
+++ b/src/workload-orchestration/azext_workload_orchestration/aaz/latest/workload_orchestration/target/_solution_revision_list.py
@@ -18,7 +18,7 @@ class ListRevisions(AAZCommand):
     """List all revisions of a solution deployed on a target    
     :example:
         List all revisions of a solution on a target
-        az workload-orchestration target solution-revision-list -g MyResourceGroup --target-name MyTarget --solution-name MySolution
+        az workload-orchestration target solution-revision-list -g MyResourceGroup --target-name MyTarget --solution-version-name MySolution
     """
 
     _aaz_info = {
@@ -49,7 +49,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
         )
         _args_schema.solution_name = AAZStrArg(
-            options=["--solution-template-name", "--solution"],
+            options=["--solution-version-name", "--solution"],
             help="Name of the solution",
             required=True,
             fmt=AAZStrArgFormat(