diff --git a/rally-jobs/plugins/fake_plugin.py b/rally-jobs/plugins/fake_plugin.py
index 378c2dbb..c23137f9 100644
--- a/rally-jobs/plugins/fake_plugin.py
+++ b/rally-jobs/plugins/fake_plugin.py
@@ -21,6 +21,7 @@ from rally.benchmark.scenarios import base
 
 
 class FakePlugin(base.Scenario):
+    """Fake plugin with a scenario."""
 
     @base.atomic_action_timer("test1")
     def _test1(self, factor):
@@ -32,5 +33,9 @@ class FakePlugin(base.Scenario):
 
     @base.scenario()
     def testplugin(self, factor=1):
+        """Fake scenario.
+
+        :param factor: influences the argument value for a time.sleep() call
+        """
         self._test1(factor)
         self._test2(factor)
diff --git a/rally-jobs/rally.yaml b/rally-jobs/rally.yaml
index 6194fe38..91f0c1c4 100755
--- a/rally-jobs/rally.yaml
+++ b/rally-jobs/rally.yaml
@@ -734,7 +734,7 @@
   CinderVolumes.create_and_attach_volume:
     -
       args:
-        volume_size: 1
+        size: 1
         image:
           name: "^cirros.*uec$"
         flavor:
@@ -755,7 +755,7 @@
     -
       args:
           volume_type: false
-          volume_size:
+          size:
               min: 1
               max: 2
       runner:
@@ -778,7 +778,7 @@
     -
       args:
           volume_type: true
-          volume_size:
+          size:
               min: 1
               max: 2
       runner:
@@ -803,7 +803,7 @@
   CinderVolumes.create_nested_snapshots_and_attach_volume:
     -
       args:
-          volume_size:
+          size:
               min: 1
               max: 2
           nested_level:
diff --git a/tests/unit/fakes.py b/tests/unit/fakes.py
index 301a97a8..22172f10 100644
--- a/tests/unit/fakes.py
+++ b/tests/unit/fakes.py
@@ -1288,6 +1288,7 @@ class FakeRunner(object):
 
 
 class FakeScenario(base.Scenario):
+    """Fake Scenario class."""
 
     def idle_time(self):
         return 0