diff --git a/heat/tests/generic_resource.py b/heat/tests/generic_resource.py
index 2fd87e830e..5f98af74a0 100644
--- a/heat/tests/generic_resource.py
+++ b/heat/tests/generic_resource.py
@@ -184,9 +184,9 @@ class ResourceWithResourceID(GenericResource):
         self.resource_id_set(self.properties.get('ID'))
 
     def handle_delete(self):
-        self.mox_resource_id(self.resource_id)
+        self.mock_resource_id(self.resource_id)
 
-    def mox_resource_id(self, resource_id):
+    def mock_resource_id(self, resource_id):
         pass
 
 
diff --git a/heat/tests/test_stack_update.py b/heat/tests/test_stack_update.py
index ce5e53bb44..7a96a3f95d 100644
--- a/heat/tests/test_stack_update.py
+++ b/heat/tests/test_stack_update.py
@@ -664,7 +664,7 @@ class StackUpdateTest(common.HeatTestCase):
         mock_create = self.patchobject(generic_rsrc.ResourceWithResourceID,
                                        'handle_create', side_effect=Exception)
         mock_id = self.patchobject(generic_rsrc.ResourceWithResourceID,
-                                   'mox_resource_id',
+                                   'mock_resource_id',
                                    return_value=None)
 
         self.stack.update(updated_stack)
@@ -718,7 +718,7 @@ class StackUpdateTest(common.HeatTestCase):
                                        'handle_create',
                                        side_effect=[None, Exception])
         mock_id = self.patchobject(generic_rsrc.ResourceWithResourceID,
-                                   'mox_resource_id', return_value=None)
+                                   'mock_resource_id', return_value=None)
 
         self.stack.update(updated_stack)
         # set resource_id for AResource because handle_create() is overwritten
@@ -772,7 +772,7 @@ class StackUpdateTest(common.HeatTestCase):
         mock_create = self.patchobject(generic_rsrc.ResourceWithResourceID,
                                        'handle_create', side_effect=Exception)
         mock_id = self.patchobject(generic_rsrc.ResourceWithResourceID,
-                                   'mox_resource_id', return_value=None)
+                                   'mock_resource_id', return_value=None)
 
         self.stack.update(updated_stack)
         # Override stack status and resources status for emulating
@@ -827,7 +827,7 @@ class StackUpdateTest(common.HeatTestCase):
                                        'handle_create',
                                        side_effect=[None, Exception])
         mock_id = self.patchobject(generic_rsrc.ResourceWithResourceID,
-                                   'mox_resource_id', return_value=None)
+                                   'mock_resource_id', return_value=None)
 
         self.stack.update(updated_stack)
         # set resource_id for AResource because handle_create() is mocked