diff --git a/Dockerfile b/Dockerfile
index b4a6d51c05..64a475f699 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ RUN echo '[ ! -z "$TERM" -a -r /etc/motd ] && cat /etc/motd' \
             >> /etc/bash.bashrc; echo '\
 ╔═════════════════════════════════════════════════════════════════════════════╗\n\
 ║ Welcome to Rally Docker container!                                          ║\n\
-║  Rally certification tasks, samples and docs are located at ~/source/       ║\n\
+║  Rally pre created tasks, samples and docs are located at ~/source/         ║\n\
 ║  Rally configuration and DB are in ~/.rally/                                ║\n\
 ║  Rally at readthedocs - http://rally.readthedocs.org                        ║\n\
 ║  How to contribute - http://rally.readthedocs.org/en/latest/contribute.html ║\n\
diff --git a/doc/source/install_and_upgrade/install.rst b/doc/source/install_and_upgrade/install.rst
index 6ae29a92ec..2b1ed13911 100644
--- a/doc/source/install_and_upgrade/install.rst
+++ b/doc/source/install_and_upgrade/install.rst
@@ -135,7 +135,7 @@ be done via the following steps:
    likely to work if your home directory has excessively open
    permissions (e.g., ``0755``), which is not recommended.
 
-You can find all task samples, docs and certification tasks at /opt/rally/.
+You can find all task samples, docs and pre created tasks at /opt/rally/.
 Also you may want to save the last command as an alias:
 
 .. code-block:: bash
diff --git a/tasks/README.rst b/tasks/README.rst
new file mode 100644
index 0000000000..6d7d186a0f
--- /dev/null
+++ b/tasks/README.rst
@@ -0,0 +1,6 @@
+================================
+Rally Tasks For Production Usage
+================================
+
+
+Detailed Instruction TBD
\ No newline at end of file
diff --git a/certification/openstack/README.rst b/tasks/openstack/README.rst
similarity index 100%
rename from certification/openstack/README.rst
rename to tasks/openstack/README.rst
diff --git a/certification/openstack/macro/macro.yaml b/tasks/openstack/macro/macro.yaml
similarity index 100%
rename from certification/openstack/macro/macro.yaml
rename to tasks/openstack/macro/macro.yaml
diff --git a/certification/openstack/scenario/authentication.yaml b/tasks/openstack/scenario/authentication.yaml
similarity index 100%
rename from certification/openstack/scenario/authentication.yaml
rename to tasks/openstack/scenario/authentication.yaml
diff --git a/certification/openstack/scenario/cinder.yaml b/tasks/openstack/scenario/cinder.yaml
similarity index 100%
rename from certification/openstack/scenario/cinder.yaml
rename to tasks/openstack/scenario/cinder.yaml
diff --git a/certification/openstack/scenario/glance.yaml b/tasks/openstack/scenario/glance.yaml
similarity index 100%
rename from certification/openstack/scenario/glance.yaml
rename to tasks/openstack/scenario/glance.yaml
diff --git a/certification/openstack/scenario/keystone.yaml b/tasks/openstack/scenario/keystone.yaml
similarity index 100%
rename from certification/openstack/scenario/keystone.yaml
rename to tasks/openstack/scenario/keystone.yaml
diff --git a/certification/openstack/scenario/neutron.yaml b/tasks/openstack/scenario/neutron.yaml
similarity index 100%
rename from certification/openstack/scenario/neutron.yaml
rename to tasks/openstack/scenario/neutron.yaml
diff --git a/certification/openstack/scenario/nova.yaml b/tasks/openstack/scenario/nova.yaml
similarity index 100%
rename from certification/openstack/scenario/nova.yaml
rename to tasks/openstack/scenario/nova.yaml
diff --git a/certification/openstack/task.yaml b/tasks/openstack/task.yaml
similarity index 100%
rename from certification/openstack/task.yaml
rename to tasks/openstack/task.yaml
diff --git a/certification/openstack/task_arguments.yaml b/tasks/openstack/task_arguments.yaml
similarity index 100%
rename from certification/openstack/task_arguments.yaml
rename to tasks/openstack/task_arguments.yaml
diff --git a/tests/ci/hooks/certification_post_test_hook.sh b/tests/ci/hooks/certification_post_test_hook.sh
index b2ff9720b7..ea2bdf7701 100755
--- a/tests/ci/hooks/certification_post_test_hook.sh
+++ b/tests/ci/hooks/certification_post_test_hook.sh
@@ -5,7 +5,7 @@ source $SCRIPT_DIR/../rally_gate_functions.sh
 
 setUp
 
-TASK=$RALLY_DIR/certification/openstack/task.yaml
+TASK=$RALLY_DIR/tasks/openstack/task.yaml
 TASK_ARGS=$RALLY_DIR/rally-jobs/certifcation_task_args.yaml
 
 TASK_ARGS="--task-args-file $TASK_ARGS"
diff --git a/tests/functional/test_certification_task.py b/tests/functional/test_certification_task.py
index 5386f649bb..b5b975a200 100644
--- a/tests/functional/test_certification_task.py
+++ b/tests/functional/test_certification_task.py
@@ -21,13 +21,13 @@ import unittest
 from tests.functional import utils
 
 
-class TestCertificationTask(unittest.TestCase):
+class TestPreCreatedTasks(unittest.TestCase):
 
     def test_task_samples_is_valid(self):
         rally = utils.Rally()
         full_path = os.path.join(
             os.path.dirname(__file__), os.pardir, os.pardir,
-            "certification", "openstack")
+            "tasks", "openstack")
         task_path = os.path.join(full_path, "task.yaml")
         args_path = os.path.join(full_path, "task_arguments.yaml")