diff --git a/src/README.rst b/src/README.rst
index ae3fc27e..72fb7854 100644
--- a/src/README.rst
+++ b/src/README.rst
@@ -20,7 +20,8 @@ Change Log
 -----
 
 - Rename compose deployment creation and upgrade progress commands to accept 'deployment-name' as identifier (#44)
-- Fix incorrect parsing error when updating service description load metrics (#47) 
+- Fix incorrect parsing error when updating service description load metrics (#47)
+- Fix incorrect application upgrade argument names (#37)
 
 2.0.0
 -----
diff --git a/src/sfctl/custom_app.py b/src/sfctl/custom_app.py
index 4fa8d9b1..683f39c3 100644
--- a/src/sfctl/custom_app.py
+++ b/src/sfctl/custom_app.py
@@ -251,9 +251,10 @@ def create(client,  # pylint: disable=too-many-locals,too-many-arguments
     client.create_application(app_desc, timeout)
 
 def upgrade(  # pylint: disable=too-many-arguments,too-many-locals,missing-docstring
-        client, app_id, app_version, parameters, mode="UnmonitoredAuto",
-        replica_set_check_timeout=None, force_restart=None,
-        failure_action=None, health_check_wait_duration="0",
+        client, application_name, application_version, parameters,
+        mode="UnmonitoredAuto", replica_set_check_timeout=None,
+        force_restart=None, failure_action=None,
+        health_check_wait_duration="0",
         health_check_stable_duration="PT0H2M0S",
         health_check_retry_timeout="PT0H10M0S",
         upgrade_timeout="P10675199DT02H48M05.4775807S",
@@ -292,10 +293,10 @@ def upgrade(  # pylint: disable=too-many-arguments,too-many-locals,missing-docst
                                                 max_unhealthy_apps, def_shp,
                                                 map_shp)
 
-    desc = ApplicationUpgradeDescription(app_id, app_version, app_params,
-                                         "Rolling", mode,
+    desc = ApplicationUpgradeDescription(application_name, application_version,
+                                         app_params, "Rolling", mode,
                                          replica_set_check_timeout,
                                          force_restart, monitoring_policy,
                                          app_health_policy)
 
-    client.start_application_upgrade(app_id, desc, timeout)
+    client.start_application_upgrade(application_name, desc, timeout)
diff --git a/src/sfctl/helps/app.py b/src/sfctl/helps/app.py
index 858f322e..cc63989b 100644
--- a/src/sfctl/helps/app.py
+++ b/src/sfctl/helps/app.py
@@ -47,16 +47,16 @@
       parameters list. This would results in application using the default
       value of the parameters from the application manifest.
     parameters:
-        - name: --app-id
+        - name: --application-name
           type: string
-          short-summary: The identity of the application.
+          short-summary: The name of the application
           long-summary: "This is typically the full name of the application
-            without the 'fabric:' URI scheme. Starting from version 6.0,
+            with the 'fabric:' URI scheme. Starting from version 6.0,
             hierarchical names are delimited with the '~' character. For
-            example, if the application name is 'fabric://myapp/app1', the
+            example, if the application name is 'fabric:/myapp/app1', the
             application identity would be 'myapp~app1' in 6.0+ and 'myapp/app1'
             in previous versions."
-        - name: --app-version
+        - name: --application-version
           type: string
           short-summary: Target application version
         - name: --parameters