diff --git a/include/openbsc/gsm_data.h b/include/openbsc/gsm_data.h
index b96ec40..c87b25d 100644
--- a/include/openbsc/gsm_data.h
+++ b/include/openbsc/gsm_data.h
@@ -205,7 +205,7 @@
 	struct gsm_bts *bts;
 
 	/* tick timer */
-	struct timer_list page_timer;
+	struct timer_list paging_timer;
 };
 
 /* One BTS */
diff --git a/include/openbsc/paging.h b/include/openbsc/paging.h
index 44361f7..1260a9b 100644
--- a/include/openbsc/paging.h
+++ b/include/openbsc/paging.h
@@ -30,12 +30,12 @@
 #include "timer.h"
 
 /* call once for every gsm_bts... */
-void page_init(struct gsm_bts *bts);
+void paging_init(struct gsm_bts *bts);
 
 /* schedule paging request */
-void page_request(struct gsm_bts *bts, struct gsm_subscriber *subscr, int type);
+void paging_request(struct gsm_bts *bts, struct gsm_subscriber *subscr, int type);
 
 /* stop paging requests */
-void page_request_stop(struct gsm_bts *bts, struct gsm_subscriber *subscr);
+void paging_request_stop(struct gsm_bts *bts, struct gsm_subscriber *subscr);
 
 #endif