diff --git a/heat/engine/resources/openstack/designate/domain.py b/heat/engine/resources/openstack/designate/domain.py
index 895a625d28..36244e4684 100644
--- a/heat/engine/resources/openstack/designate/domain.py
+++ b/heat/engine/resources/openstack/designate/domain.py
@@ -89,10 +89,7 @@ class DesignateDomain(resource.Resource):
 
         self.resource_id_set(domain.id)
 
-    def handle_update(self,
-                      json_snippet=None,
-                      tmpl_diff=None,
-                      prop_diff=None):
+    def handle_update(self, json_snippet, tmpl_diff, prop_diff):
         args = dict()
 
         if prop_diff.get(self.EMAIL):
diff --git a/heat/engine/resources/openstack/designate/record.py b/heat/engine/resources/openstack/designate/record.py
index 26369cacb6..96a7403d01 100644
--- a/heat/engine/resources/openstack/designate/record.py
+++ b/heat/engine/resources/openstack/designate/record.py
@@ -115,10 +115,7 @@ class DesignateRecord(resource.Resource):
 
         self.resource_id_set(domain.id)
 
-    def handle_update(self,
-                      json_snippet=None,
-                      tmpl_diff=None,
-                      prop_diff=None):
+    def handle_update(self, json_snippet, tmpl_diff, prop_diff):
         args = dict()
 
         if prop_diff.get(self.TTL):
diff --git a/heat/engine/resources/openstack/keystone/endpoint.py b/heat/engine/resources/openstack/keystone/endpoint.py
index 51ecfbb8da..5211edfce9 100644
--- a/heat/engine/resources/openstack/keystone/endpoint.py
+++ b/heat/engine/resources/openstack/keystone/endpoint.py
@@ -117,10 +117,7 @@ class KeystoneEndpoint(resource.Resource):
 
         self.resource_id_set(endpoint.id)
 
-    def handle_update(self,
-                      json_snippet=None,
-                      tmpl_diff=None,
-                      prop_diff=None):
+    def handle_update(self, json_snippet, tmpl_diff, prop_diff):
         region = prop_diff.get(self.REGION)
         service = prop_diff.get(self.SERVICE)
         interface = prop_diff.get(self.INTERFACE)
diff --git a/heat/engine/resources/openstack/keystone/group.py b/heat/engine/resources/openstack/keystone/group.py
index f49c945248..fb568619fd 100644
--- a/heat/engine/resources/openstack/keystone/group.py
+++ b/heat/engine/resources/openstack/keystone/group.py
@@ -105,7 +105,7 @@ class KeystoneGroup(role_assignments.KeystoneRoleAssignment):
         super(KeystoneGroup, self).handle_create(user_id=None,
                                                  group_id=group.id)
 
-    def handle_update(self, json_snippet=None, tmpl_diff=None, prop_diff=None):
+    def handle_update(self, json_snippet, tmpl_diff, prop_diff):
         name = prop_diff.get(self.NAME) or self.physical_resource_name()
         description = prop_diff.get(self.DESCRIPTION)
         domain = (prop_diff.get(self.DOMAIN) or
diff --git a/heat/engine/resources/openstack/keystone/project.py b/heat/engine/resources/openstack/keystone/project.py
index 8c68c321d5..8ec0d2ccd9 100644
--- a/heat/engine/resources/openstack/keystone/project.py
+++ b/heat/engine/resources/openstack/keystone/project.py
@@ -114,10 +114,7 @@ class KeystoneProject(resource.Resource):
 
         self.resource_id_set(project.id)
 
-    def handle_update(self,
-                      json_snippet=None,
-                      tmpl_diff=None,
-                      prop_diff=None):
+    def handle_update(self, json_snippet, tmpl_diff, prop_diff):
         name = prop_diff.get(self.NAME) or self.physical_resource_name()
         description = prop_diff.get(self.DESCRIPTION)
         enabled = prop_diff.get(self.ENABLED)
diff --git a/heat/engine/resources/openstack/keystone/role.py b/heat/engine/resources/openstack/keystone/role.py
index c9a4b3928c..966bc9891c 100644
--- a/heat/engine/resources/openstack/keystone/role.py
+++ b/heat/engine/resources/openstack/keystone/role.py
@@ -60,15 +60,13 @@ class KeystoneRole(resource.Resource):
 
         self.resource_id_set(role.id)
 
-    def handle_update(self, json_snippet=None, tmpl_diff=None, prop_diff=None):
-        if prop_diff is None:
-            return
-
-        name = prop_diff.get(self.NAME) or self.physical_resource_name()
-        self._update_role(
-            role_id=self.resource_id,
-            new_name=name
-        )
+    def handle_update(self, json_snippet, tmpl_diff, prop_diff):
+        if self.NAME in prop_diff:
+            name = prop_diff.get(self.NAME) or self.physical_resource_name()
+            self._update_role(
+                role_id=self.resource_id,
+                new_name=name
+            )
 
     def handle_delete(self):
         if self.resource_id is not None:
diff --git a/heat/engine/resources/openstack/keystone/service.py b/heat/engine/resources/openstack/keystone/service.py
index 308e751b94..7eb6667863 100644
--- a/heat/engine/resources/openstack/keystone/service.py
+++ b/heat/engine/resources/openstack/keystone/service.py
@@ -88,10 +88,7 @@ class KeystoneService(resource.Resource):
 
         self.resource_id_set(service.id)
 
-    def handle_update(self,
-                      json_snippet=None,
-                      tmpl_diff=None,
-                      prop_diff=None):
+    def handle_update(self, json_snippet, tmpl_diff, prop_diff):
         name = None
         if self.NAME in prop_diff:
             name = (prop_diff.get(self.NAME) or
diff --git a/heat/engine/resources/openstack/keystone/user.py b/heat/engine/resources/openstack/keystone/user.py
index 9def6effc5..3b57ad0fc5 100644
--- a/heat/engine/resources/openstack/keystone/user.py
+++ b/heat/engine/resources/openstack/keystone/user.py
@@ -206,7 +206,7 @@ class KeystoneUser(role_assignments.KeystoneRoleAssignment):
         super(KeystoneUser, self).handle_create(user_id=user.id,
                                                 group_id=None)
 
-    def handle_update(self, json_snippet=None, tmpl_diff=None, prop_diff=None):
+    def handle_update(self, json_snippet, tmpl_diff, prop_diff):
         name = prop_diff.get(self.NAME) or self.physical_resource_name()
         description = prop_diff.get(self.DESCRIPTION)
         enabled = prop_diff.get(self.ENABLED)
diff --git a/heat/engine/resources/openstack/manila/security_service.py b/heat/engine/resources/openstack/manila/security_service.py
index 235d8c8098..7e58be9976 100644
--- a/heat/engine/resources/openstack/manila/security_service.py
+++ b/heat/engine/resources/openstack/manila/security_service.py
@@ -92,7 +92,7 @@ class SecurityService(resource.Resource):
         security_service = self.client().security_services.create(**args)
         self.resource_id_set(security_service.id)
 
-    def handle_update(self, json_snippet=None, tmpl_diff=None, prop_diff=None):
+    def handle_update(self, json_snippet, tmpl_diff, prop_diff):
         if prop_diff:
             self.client().security_services.update(self.resource_id,
                                                    **prop_diff)
diff --git a/heat/engine/resources/openstack/manila/share_network.py b/heat/engine/resources/openstack/manila/share_network.py
index c4210361e6..1e5b918682 100644
--- a/heat/engine/resources/openstack/manila/share_network.py
+++ b/heat/engine/resources/openstack/manila/share_network.py
@@ -140,7 +140,7 @@ class ManilaShareNetwork(resource.Resource):
                 self.resource_id,
                 self.client_plugin().get_security_service(service).id)
 
-    def handle_update(self, json_snippet=None, tmpl_diff=None, prop_diff=None):
+    def handle_update(self, json_snippet, tmpl_diff, prop_diff):
         if self.SECURITY_SERVICES in prop_diff:
             services = prop_diff.pop(self.SECURITY_SERVICES)
             s_curr = set([self.client_plugin().get_security_service(s).id
diff --git a/heat/engine/resources/openstack/mistral/workflow.py b/heat/engine/resources/openstack/mistral/workflow.py
index 51935ff174..2005cbbadc 100644
--- a/heat/engine/resources/openstack/mistral/workflow.py
+++ b/heat/engine/resources/openstack/mistral/workflow.py
@@ -350,7 +350,7 @@ class Workflow(signal_responder.SignalResponder,
             executions.extend(self.data().get(self.EXECUTIONS).split(','))
         self.data_set(self.EXECUTIONS, ','.join(executions))
 
-    def handle_update(self, json_snippet=None, tmpl_diff=None, prop_diff=None):
+    def handle_update(self, json_snippet, tmpl_diff, prop_diff):
         update_allowed = [self.INPUT, self.PARAMS, self.DESCRIPTION]
         for prop in update_allowed:
             if prop in prop_diff: