diff --git a/config/khal/khal.conf b/config/khal/khal.conf
index 4450a08..9b2d77f 100644
--- a/config/khal/khal.conf
+++ b/config/khal/khal.conf
@@ -1,8 +1,8 @@
 [calendars]
-[[my_calendars_local]]
+[[calendars_local]]
 path = ~/.calendars/
 type = discover
-[[my_contacts_local]]
+[[contacts_local]]
 path = ~/.contacts/contacts.vcf/
 type = birthdays
 
diff --git a/config/vdirsyncer/config.m4 b/config/vdirsyncer/config.m4
index f291da0..66e3619 100644
--- a/config/vdirsyncer/config.m4
+++ b/config/vdirsyncer/config.m4
@@ -1,35 +1,35 @@
 [general]
 status_path = ~/.vdirsyncer/status/
 
-[pair my_calendars]
-a = my_calendars_local
-b = my_calendars_remote
+[pair calendars]
+a = calendars_local
+b = calendars_remote
 conflict_resolution = b wins
 collections = ["from b"]
 
-[storage my_calendars_local]
+[storage calendars_local]
 type = filesystem
 path = ~/.calendars/
 fileext = .ics
 
-[storage my_calendars_remote]
+[storage calendars_remote]
 type = caldav
 url = "https://radicale.gebner.org/gebner/"
 username = gebner
 password = esyscmd(`pass 2b7e.org/mail.gebner.org | head -n1')
 
-[pair my_contacts]
-a = my_contacts_local
-b = my_contacts_remote
+[pair contacts]
+a = contacts_local
+b = contacts_remote
 conflict_resolution = b wins
 collections = ["from b"]
 
-[storage my_contacts_local]
+[storage contacts_local]
 type = filesystem
 path = ~/.contacts/
 fileext = .vcf
 
-[storage my_contacts_remote]
+[storage contacts_remote]
 type = carddav
 url = "https://radicale.gebner.org/gebner/"
 username = gebner