diff --git a/drivers/atmodem/call-barring.c b/drivers/atmodem/call-barring.c
index b161b88e..af295266 100644
--- a/drivers/atmodem/call-barring.c
+++ b/drivers/atmodem/call-barring.c
@@ -222,7 +222,7 @@ static void at_call_barring_remove(struct ofono_call_barring *cb)
 }
 
 static struct ofono_call_barring_driver driver = {
-	.name		= "generic_at",
+	.name		= "atmodem",
 	.probe		= at_call_barring_probe,
 	.remove		= at_call_barring_remove,
 	.set		= at_call_barring_set,
diff --git a/drivers/atmodem/call-forwarding.c b/drivers/atmodem/call-forwarding.c
index 0277caab..b4fe680c 100644
--- a/drivers/atmodem/call-forwarding.c
+++ b/drivers/atmodem/call-forwarding.c
@@ -278,7 +278,7 @@ static void at_ccfc_remove(struct ofono_call_forwarding *cf)
 }
 
 static struct ofono_call_forwarding_driver driver = {
-	.name		= "generic_at",
+	.name		= "atmodem",
 	.probe		= at_ccfc_probe,
 	.remove		= at_ccfc_remove,
 	.registration	= at_ccfc_registration,
diff --git a/drivers/atmodem/call-meter.c b/drivers/atmodem/call-meter.c
index 903ac608..a6a5eb93 100644
--- a/drivers/atmodem/call-meter.c
+++ b/drivers/atmodem/call-meter.c
@@ -384,7 +384,7 @@ static void at_caoc_remove(struct ofono_call_meter *cm)
 }
 
 static struct ofono_call_meter_driver driver = {
-	.name = "generic_at",
+	.name = "atmodem",
 	.probe = at_caoc_probe,
 	.remove = at_caoc_remove,
 	.call_meter_query = at_caoc_query,
diff --git a/drivers/atmodem/call-settings.c b/drivers/atmodem/call-settings.c
index 21566c8a..c4debc90 100644
--- a/drivers/atmodem/call-settings.c
+++ b/drivers/atmodem/call-settings.c
@@ -381,7 +381,7 @@ static void at_call_settings_remove(struct ofono_call_settings *cs)
 }
 
 static struct ofono_call_settings_driver driver = {
-	.name = "generic_at",
+	.name = "atmodem",
 	.probe = at_call_settings_probe,
 	.remove = at_call_settings_remove,
 	.clip_query = at_clip_query,
diff --git a/drivers/atmodem/devinfo.c b/drivers/atmodem/devinfo.c
index 97d969a4..fd51207d 100644
--- a/drivers/atmodem/devinfo.c
+++ b/drivers/atmodem/devinfo.c
@@ -205,7 +205,7 @@ static void at_devinfo_remove(struct ofono_devinfo *info)
 }
 
 static struct ofono_devinfo_driver driver = {
-	.name = "generic_at",
+	.name = "atmodem",
 	.probe = at_devinfo_probe,
 	.remove = at_devinfo_remove,
 	.query_manufacturer = at_query_manufacturer,
diff --git a/drivers/atmodem/network-registration.c b/drivers/atmodem/network-registration.c
index a7752720..bfad315d 100644
--- a/drivers/atmodem/network-registration.c
+++ b/drivers/atmodem/network-registration.c
@@ -661,7 +661,7 @@ static void at_netreg_remove(struct ofono_netreg *netreg)
 }
 
 static struct ofono_netreg_driver driver = {
-	.name				= "generic_at",
+	.name				= "atmodem",
 	.probe				= at_netreg_probe,
 	.remove				= at_netreg_remove,
 	.registration_status 		= at_registration_status,
diff --git a/drivers/atmodem/phonebook.c b/drivers/atmodem/phonebook.c
index 20918af6..2a1d2813 100644
--- a/drivers/atmodem/phonebook.c
+++ b/drivers/atmodem/phonebook.c
@@ -545,7 +545,7 @@ static void at_phonebook_remove(struct ofono_phonebook *pb)
 }
 
 static struct ofono_phonebook_driver driver = {
-	.name			= "generic_at",
+	.name			= "atmodem",
 	.probe			= at_phonebook_probe,
 	.remove			= at_phonebook_remove,
 	.export_entries		= at_export_entries
diff --git a/drivers/atmodem/sim.c b/drivers/atmodem/sim.c
index 0bfcec3f..83336707 100644
--- a/drivers/atmodem/sim.c
+++ b/drivers/atmodem/sim.c
@@ -456,7 +456,7 @@ static void at_sim_remove(struct ofono_sim *sim)
 }
 
 static struct ofono_sim_driver driver = {
-	.name			= "generic_at",
+	.name			= "atmodem",
 	.probe			= at_sim_probe,
 	.remove			= at_sim_remove,
 	.read_file_info		= at_sim_read_info,
diff --git a/drivers/atmodem/sms.c b/drivers/atmodem/sms.c
index 61f7aa7d..fc6c0528 100644
--- a/drivers/atmodem/sms.c
+++ b/drivers/atmodem/sms.c
@@ -986,7 +986,7 @@ static void at_sms_remove(struct ofono_sms *sms)
 }
 
 static struct ofono_sms_driver driver = {
-	.name = "generic_at",
+	.name = "atmodem",
 	.probe = at_sms_probe,
 	.remove = at_sms_remove,
 	.sca_query	= at_csca_query,
diff --git a/drivers/atmodem/ssn.c b/drivers/atmodem/ssn.c
index 533760d4..a43f6193 100644
--- a/drivers/atmodem/ssn.c
+++ b/drivers/atmodem/ssn.c
@@ -127,7 +127,7 @@ static void at_ssn_remove(struct ofono_ssn *ssn)
 }
 
 static struct ofono_ssn_driver driver = {
-	.name = "generic_at",
+	.name = "atmodem",
 	.probe = at_ssn_probe,
 	.remove = at_ssn_remove,
 };
diff --git a/drivers/atmodem/ussd.c b/drivers/atmodem/ussd.c
index ba39c00e..13f86a63 100644
--- a/drivers/atmodem/ussd.c
+++ b/drivers/atmodem/ussd.c
@@ -159,7 +159,7 @@ static void at_ussd_remove(struct ofono_ussd *ussd)
 }
 
 static struct ofono_ussd_driver driver = {
-	.name = "generic_at",
+	.name = "atmodem",
 	.probe = at_ussd_probe,
 	.remove = at_ussd_remove,
 	.request = at_ussd_request,
diff --git a/drivers/atmodem/voicecall.c b/drivers/atmodem/voicecall.c
index 45e0de1b..124e48ac 100644
--- a/drivers/atmodem/voicecall.c
+++ b/drivers/atmodem/voicecall.c
@@ -1013,7 +1013,7 @@ static void at_voicecall_remove(struct ofono_voicecall *vc)
 }
 
 static struct ofono_voicecall_driver driver = {
-	.name			= "generic_at",
+	.name			= "atmodem",
 	.probe			= at_voicecall_probe,
 	.remove			= at_voicecall_remove,
 	.dial			= at_dial,
diff --git a/plugins/generic_at.c b/plugins/generic_at.c
index 3a36525e..476302b8 100644
--- a/plugins/generic_at.c
+++ b/plugins/generic_at.c
@@ -507,18 +507,18 @@ static void generic_at_populate(struct ofono_modem *modem)
 	GAtChat *chat = d->chat;
 	struct ofono_message_waiting *mw;
 
-	ofono_devinfo_create(modem, 0, "generic_at", chat);
-	ofono_ussd_create(modem, 0, "generic_at", chat);
-	ofono_sim_create(modem, 0, "generic_at", chat);
-	ofono_call_forwarding_create(modem, 0, "generic_at", chat);
-	ofono_call_settings_create(modem, 0, "generic_at", chat);
-	ofono_netreg_create(modem, 0, "generic_at", chat);
-	ofono_voicecall_create(modem, 0, "generic_at", chat);
-	ofono_call_meter_create(modem, 0, "generic_at", chat);
-	ofono_call_barring_create(modem, 0, "generic_at", chat);
-	ofono_ssn_create(modem, 0, "generic_at", chat);
-	ofono_sms_create(modem, 0, "generic_at", chat);
-	ofono_phonebook_create(modem, 0, "generic_at", chat);
+	ofono_devinfo_create(modem, 0, "atmodem", chat);
+	ofono_ussd_create(modem, 0, "atmodem", chat);
+	ofono_sim_create(modem, 0, "atmodem", chat);
+	ofono_call_forwarding_create(modem, 0, "atmodem", chat);
+	ofono_call_settings_create(modem, 0, "atmodem", chat);
+	ofono_netreg_create(modem, 0, "atmodem", chat);
+	ofono_voicecall_create(modem, 0, "atmodem", chat);
+	ofono_call_meter_create(modem, 0, "atmodem", chat);
+	ofono_call_barring_create(modem, 0, "atmodem", chat);
+	ofono_ssn_create(modem, 0, "atmodem", chat);
+	ofono_sms_create(modem, 0, "atmodem", chat);
+	ofono_phonebook_create(modem, 0, "atmodem", chat);
 
 	mw = ofono_message_waiting_create(modem);
 	if (mw)