diff --git a/roles/taskotron/master/defaults/main.yml b/roles/taskotron/taskotron-master/defaults/main.yml
similarity index 100%
rename from roles/taskotron/master/defaults/main.yml
rename to roles/taskotron/taskotron-master/defaults/main.yml
diff --git a/roles/taskotron/master/tasks/main.yml b/roles/taskotron/taskotron-master/tasks/main.yml
similarity index 100%
rename from roles/taskotron/master/tasks/main.yml
rename to roles/taskotron/taskotron-master/tasks/main.yml
diff --git a/roles/taskotron/master/templates/artifacts.conf.j2 b/roles/taskotron/taskotron-master/templates/artifacts.conf.j2
similarity index 100%
rename from roles/taskotron/master/templates/artifacts.conf.j2
rename to roles/taskotron/taskotron-master/templates/artifacts.conf.j2
diff --git a/roles/taskotron/master/templates/taskotron-tmpwatch.cron.j2 b/roles/taskotron/taskotron-master/templates/taskotron-tmpwatch.cron.j2
similarity index 100%
rename from roles/taskotron/master/templates/taskotron-tmpwatch.cron.j2
rename to roles/taskotron/taskotron-master/templates/taskotron-tmpwatch.cron.j2