diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2cecbcfc..102ed64d 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -46,6 +46,8 @@ Changed
   api information has been moved into credentials object.
 * `Docker image <https://hub.docker.com/r/xrally/xrally-openstack>`_ now
   supports mysql and postgres as db backends.
+* Rename an action ``nova.create_image`` to ``nova.snapshot_server`` for better
+  understanding for what is actually done.
 
 Removed
 ~~~~~~~
diff --git a/rally_openstack/scenarios/nova/utils.py b/rally_openstack/scenarios/nova/utils.py
index d212135a..17e31847 100644
--- a/rally_openstack/scenarios/nova/utils.py
+++ b/rally_openstack/scenarios/nova/utils.py
@@ -483,7 +483,7 @@ class NovaScenario(scenario.OpenStackScenario):
                 check_interval=check_interval
             )
 
-    @atomic.action_timer("nova.create_image")
+    @atomic.action_timer("nova.snapshot_server")
     def _create_image(self, server):
         """Create an image from the given server
 
diff --git a/tests/unit/scenarios/nova/test_utils.py b/tests/unit/scenarios/nova/test_utils.py
index 68ccfed0..a7bd62fe 100644
--- a/tests/unit/scenarios/nova/test_utils.py
+++ b/tests/unit/scenarios/nova/test_utils.py
@@ -246,7 +246,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase):
         self.assertEqual(self.mock_wait_for_status.mock.return_value,
                          return_image)
         self._test_atomic_action_timer(nova_scenario.atomic_actions(),
-                                       "nova.create_image")
+                                       "nova.snapshot_server")
 
     def test__default_delete_server(self):
         nova_scenario = utils.NovaScenario(context=self.context)