diff --git a/roles/service-bird-icvpn/tasks/main.yml b/roles/service-bird-icvpn/tasks/main.yml
index adbf20b..a06a25e 100644
--- a/roles/service-bird-icvpn/tasks/main.yml
+++ b/roles/service-bird-icvpn/tasks/main.yml
@@ -59,26 +59,26 @@
     - /etc/bird/icvpn_ipv6_peers.conf
     - /etc/bird/icvpn_ipv6_roa.conf
 
-- name: write systemd unit icvpn-update.service
+- name: write systemd unit icvpn-tinc-bgp-update.service
   template:
-    src: icvpn-update.service.j2
-    dest: /etc/systemd/system/icvpn-update.service
+    src: icvpn-tinc-bgp-update.service.j2
+    dest: /etc/systemd/system/icvpn-tinc-bgp-update.service
     owner: root
     group: root
     mode: 0644
   notify: reload systemd
 
-- name: write systemd timer icvpn-update.timer
+- name: write systemd timer icvpn-tinc-bgp-update.timer
   template:
-    src: icvpn-update.timer.j2
-    dest: /etc/systemd/system/icvpn-update.timer
+    src: icvpn-tinc-bgp-update.timer.j2
+    dest: /etc/systemd/system/icvpn-tinc-bgp-update.timer
     owner: root
     group: root
     mode: 0644
   notify: reload systemd
 
-- name: configure systemd unit/timer icvpn-update
+- name: configure systemd unit/timer icvpn-tinc-bgp-update
   systemd:
-    name: icvpn-update.timer
+    name: icvpn-tinc-bgp-update.timer
     enabled: yes
     state: started
diff --git a/roles/service-bird-icvpn/templates/icvpn-update.service.j2 b/roles/service-bird-icvpn/templates/icvpn-tinc-bgp-update.service.j2
similarity index 100%
rename from roles/service-bird-icvpn/templates/icvpn-update.service.j2
rename to roles/service-bird-icvpn/templates/icvpn-tinc-bgp-update.service.j2
diff --git a/roles/service-bird-icvpn/templates/icvpn-update.timer.j2 b/roles/service-bird-icvpn/templates/icvpn-tinc-bgp-update.timer.j2
similarity index 63%
rename from roles/service-bird-icvpn/templates/icvpn-update.timer.j2
rename to roles/service-bird-icvpn/templates/icvpn-tinc-bgp-update.timer.j2
index 55c464a..b2c612e 100644
--- a/roles/service-bird-icvpn/templates/icvpn-update.timer.j2
+++ b/roles/service-bird-icvpn/templates/icvpn-tinc-bgp-update.timer.j2
@@ -2,7 +2,7 @@
 # {{ ansible_managed }}
 #
 [Unit]
-Description=Timer which schedules icvpn-update.service
+Description=Timer which schedules icvpn-tinc-bgp-update.service
 
 [Timer]
 OnBootSec=1h