diff --git a/tasks/main.yml b/tasks/main.yml
index 9fe03aa..44125d6 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -22,20 +22,20 @@
   tags:
     - always
 
-- include: pre-install.yml
+- include: rally_pre_install.yml
   tags:
     - rally-install
 
-- include: install.yml
+- include: rally_install.yml
   tags:
     - rally-install
 
-- include: post-install.yml
+- include: rally_post_install.yml
   tags:
     - rally-install
     - rally-config
 
-- include: database-setup.yml
+- include: rally_db_setup.yml
   when: inventory_hostname == groups[rally_role_project_group][0]
   tags:
     - rally-install
diff --git a/tasks/database-setup.yml b/tasks/rally_db_setup.yml
similarity index 100%
rename from tasks/database-setup.yml
rename to tasks/rally_db_setup.yml
diff --git a/tasks/install.yml b/tasks/rally_install.yml
similarity index 98%
rename from tasks/install.yml
rename to tasks/rally_install.yml
index 0192fae..7bd7e28 100644
--- a/tasks/install.yml
+++ b/tasks/rally_install.yml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: install-apt.yml
+- include: rally_install_apt.yml
   static: no
   when: ansible_pkg_mgr == 'apt'
 
diff --git a/tasks/install-apt.yml b/tasks/rally_install_apt.yml
similarity index 100%
rename from tasks/install-apt.yml
rename to tasks/rally_install_apt.yml
diff --git a/tasks/post-install.yml b/tasks/rally_post_install.yml
similarity index 100%
rename from tasks/post-install.yml
rename to tasks/rally_post_install.yml
diff --git a/tasks/pre-install.yml b/tasks/rally_pre_install.yml
similarity index 100%
rename from tasks/pre-install.yml
rename to tasks/rally_pre_install.yml