diff --git a/drivers/atmodem/sim-poll.c b/drivers/atmodem/sim-poll.c
index 45078563..f1a83e3c 100644
--- a/drivers/atmodem/sim-poll.c
+++ b/drivers/atmodem/sim-poll.c
@@ -288,7 +288,7 @@ static void stk_watch(struct ofono_atom *atom,
 		spd->stk = NULL;
 }
 
-void ofono_atmodem_poll_enable(struct ofono_modem *modem, GAtChat *chat)
+void atmodem_poll_enable(struct ofono_modem *modem, GAtChat *chat)
 {
 	struct ofono_atom *sim_atom;
 	struct ofono_atom *stk_atom;
diff --git a/drivers/atmodem/sim-poll.h b/drivers/atmodem/sim-poll.h
index 595c2f58..50ac3d31 100644
--- a/drivers/atmodem/sim-poll.h
+++ b/drivers/atmodem/sim-poll.h
@@ -19,4 +19,4 @@
  *
  */
 
-void ofono_atmodem_poll_enable(struct ofono_modem *modem, GAtChat *chat);
+void atmodem_poll_enable(struct ofono_modem *modem, GAtChat *chat);
diff --git a/plugins/atgen.c b/plugins/atgen.c
index 4a0e315b..7c38fde1 100644
--- a/plugins/atgen.c
+++ b/plugins/atgen.c
@@ -167,7 +167,7 @@ static void atgen_pre_sim(struct ofono_modem *modem)
 	ofono_voicecall_create(modem, 0, "atmodem", chat);
 	ofono_stk_create(modem, 0, "atmodem", chat);
 
-	ofono_atmodem_poll_enable(modem, chat);
+	atmodem_poll_enable(modem, chat);
 }
 
 static void atgen_post_sim(struct ofono_modem *modem)
diff --git a/plugins/phonesim.c b/plugins/phonesim.c
index 5685820e..ff49147c 100644
--- a/plugins/phonesim.c
+++ b/plugins/phonesim.c
@@ -294,7 +294,7 @@ static void phonesim_pre_sim(struct ofono_modem *modem)
 	ofono_stk_create(modem, 0, "atmodem", data->chat);
 
 	if (!data->calypso)
-		ofono_atmodem_poll_enable(modem, data->chat);
+		atmodem_poll_enable(modem, data->chat);
 	else if (sim)
 		ofono_sim_inserted_notify(sim, TRUE);
 }