diff --git a/drivers/aws_shell/src/driver.py b/drivers/aws_shell/src/driver.py
index b8d085b9..ff73f915 100644
--- a/drivers/aws_shell/src/driver.py
+++ b/drivers/aws_shell/src/driver.py
@@ -20,9 +20,6 @@ def initialize(self, context):
     def deploy_ami(self, context, request):
         return self.aws_shell.deploy_ami(context, request)
 
-    def PrepareConnectivity(self, context):
-        return "MOCK-PrepareConnectivity"
-
     def PowerOn(self, context, ports):
         return self.aws_shell.power_on_ami(context)
 
@@ -41,11 +38,11 @@ def delete(self, context, ports):
     def destroy_vm_only(self, context, ports):
         return self.aws_shell.delete_ami(context, False)
 
-    def ApplyConnectivityChanges(self, context, ports, request):
+    def ApplyConnectivityChanges(self, context, request):
         pass
 
-    def PrepareConnectivityChanges(self, context, request):
-        pass
+    def PrepareConnectivity(self, context, request):
+        return "MOCK-PrepareConnectivity"
 
     def GetApplicationPorts(self, context, ports):
         return self.aws_shell.get_application_ports(context)
diff --git a/drivers/aws_shell/src/drivermetadata.xml b/drivers/aws_shell/src/drivermetadata.xml
index 55a4e90b..79cef83e 100644
--- a/drivers/aws_shell/src/drivermetadata.xml
+++ b/drivers/aws_shell/src/drivermetadata.xml
@@ -7,7 +7,7 @@
             <Command Description="" DisplayName="Refresh IP" EnableCancellation="true" Name="remote_refresh_ip" Tags="remote_connectivity,allow_shared" />
             <Command Description="" DisplayName="Get Application Ports" EnableCancellation="true" Name="GetApplicationPorts" Tags="remote_connectivity,allow_shared" />
             <Command Description="" DisplayName="Apply Connectivity Changes" Name="ApplyConnectivityChanges" Tags="allow_unreserved" />
-            <Command Description="" DisplayName="Apply Connectivity Changes" Name="PrepareConnectivityChanges" Tags="allow_unreserved" />
+            <Command Description="" DisplayName="Prepare Connectivity Changes" Name="PrepareConnectivity" Tags="allow_unreserved" />
         </Category>
         <Category Name="App Management">
             <Command Description="" DisplayName="Delete" Name="delete" Tags="remote_app_management,allow_shared" />