diff --git a/defaults/main.yml b/defaults/main.yml
index 04c61567f6ee3dd7c18b9717d6955dfc086088bf..0b09ab399584f7c535f7d6a60c00b3023d2a887d 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1,2 @@
 ---
-# defaults file for ansible-role-unatteded-upgrades
+# defaults file for unattended-upgrades
diff --git a/handlers/main.yml b/handlers/main.yml
index 5dd4ce83cb97db4a763cb99ff09354e17d525d2b..c0b55126be580d341e482c09b8e425a4fb120536 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,2 +1,2 @@
 ---
-# handlers file for ansible-role-unatteded-upgrades
+# handlers file for unattended-upgrades
diff --git a/molecule.yml b/molecule.yml
index 329a0d84d0af5f2b12d4cb583b4e97cc226e6b7d..b69c8b9159d1f6a02b71190a7f1a5f79ab694259 100644
--- a/molecule.yml
+++ b/molecule.yml
@@ -13,7 +13,7 @@ vagrant:
   - name: jessie
     box: debian/jessie64
   instances:
-  - name: ansible-role-unatteded-upgrades
+  - name: unattended-upgrades
     options:
         append_platform_to_hostname: yes
   raw_config_args:
diff --git a/tasks/main.yml b/tasks/main.yml
index 95a578d579510f9f40cfd7b638d060fae7bf61f2..fbf2914ddffc04ecb102447b80ab3f12ca13a3da 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-# tasks file for ansible-role-unatteded-upgrades
+# tasks file for unattended-upgrades
 - name: Assertions
   assert:
     that: ansible_pkg_mgr == 'apt'
@@ -16,7 +16,7 @@
 
 - name: Configure
   with_fileglob:
-      - templates/apt.conf.d/*
+      - '{{ role_path }}/templates/apt.conf.d/*'
   template:
       src: '{{ item }}'
       dest: /etc/apt/apt.conf.d/
diff --git a/tests/playbook.yml b/tests/playbook.yml
index 4cafbd8662c6156e0f41d82b257f05d1ce7ec2ae..d3ed5be474660e9d0b1f1c2ebc4c88619077086e 100644
--- a/tests/playbook.yml
+++ b/tests/playbook.yml
@@ -1,4 +1,4 @@
 ---
 - hosts: all
   roles:
-    - role: ansible-role-unatteded-upgrades
+    - role: unattended-upgrades
diff --git a/tests/requirements.yml b/tests/requirements.yml
index 8b9b2bcba3b4459621ff239243ac0375a081f20a..ce6bd0d5ecddc519244dd9576a36c7090edae28e 100644
--- a/tests/requirements.yml
+++ b/tests/requirements.yml
@@ -1,7 +1,7 @@
 ---
-- src: https://www.shore.co.il/git/ansible-role-openbsd-bootstrap
+- src: https://www.shore.co.il/git/openbsd-bootstrap
   scm: git
   name: openbsd_bootstrap
-- src: https://www.shore.co.il/git/ansible-role-debian-bootstrap
+- src: https://www.shore.co.il/git/debian-bootstrap
   scm: git
   name: debian_bootstrap
diff --git a/vars/main.yml b/vars/main.yml
index fa9cefb97e2058e59ec1f90147f7ca4358689eff..9630fc89f46c09ae6ca5c6c4691cdf7faa4c8b5b 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,2 +1,2 @@
 ---
-# vars file for ansible-role-unatteded-upgrades
+# vars file for unattended-upgrades