diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am
index c2a82ce34..1ee96ed50 100644
--- a/include/osmocom/bsc/Makefile.am
+++ b/include/osmocom/bsc/Makefile.am
@@ -3,7 +3,7 @@ noinst_HEADERS = \
 	abis_nm.h \
 	abis_om2000.h \
 	abis_rsl.h \
-	acc_ramp.h \
+	acc.h \
 	arfcn_range_encode.h \
 	assignment_fsm.h \
 	bsc_rll.h \
diff --git a/include/osmocom/bsc/acc_ramp.h b/include/osmocom/bsc/acc.h
similarity index 100%
rename from include/osmocom/bsc/acc_ramp.h
rename to include/osmocom/bsc/acc.h
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index a8b495f0f..cfed1f82c 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -29,7 +29,7 @@
 #include <osmocom/gsm/protocol/gsm_12_21.h>
 #include <osmocom/abis/e1_input.h>
 #include <osmocom/bsc/meas_rep.h>
-#include <osmocom/bsc/acc_ramp.h>
+#include <osmocom/bsc/acc.h>
 #include <osmocom/bsc/neighbor_ident.h>
 #include <osmocom/bsc/osmux.h>
 
diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am
index a11b2958b..717a6a187 100644
--- a/src/ipaccess/Makefile.am
+++ b/src/ipaccess/Makefile.am
@@ -49,7 +49,7 @@ ipaccess_config_LDADD = \
 	$(top_builddir)/src/osmo-bsc/bts.o \
 	$(top_builddir)/src/osmo-bsc/bts_trx.o \
 	$(top_builddir)/src/osmo-bsc/abis_nm.o \
-	$(top_builddir)/src/osmo-bsc/acc_ramp.o \
+	$(top_builddir)/src/osmo-bsc/acc.o \
 	$(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts.o \
 	$(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \
 	$(top_builddir)/src/osmo-bsc/gsm_data.o \
@@ -64,7 +64,7 @@ ipaccess_proxy_SOURCES = \
 
 ipaccess_proxy_LDADD = \
 	$(top_builddir)/src/osmo-bsc/abis_nm.o \
-	$(top_builddir)/src/osmo-bsc/acc_ramp.o \
+	$(top_builddir)/src/osmo-bsc/acc.o \
 	$(top_builddir)/src/osmo-bsc/bts.o \
 	$(top_builddir)/src/osmo-bsc/bts_trx.o \
 	$(top_builddir)/src/osmo-bsc/gsm_data.o \
diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am
index 231707cd7..c19d01bf7 100644
--- a/src/osmo-bsc/Makefile.am
+++ b/src/osmo-bsc/Makefile.am
@@ -32,7 +32,7 @@ osmo_bsc_SOURCES = \
 	abis_om2000.c \
 	abis_om2000_vty.c \
 	abis_rsl.c \
-	acc_ramp.c \
+	acc.c \
 	arfcn_range_encode.c \
 	assignment_fsm.c \
 	bsc_ctrl_commands.c \
diff --git a/src/osmo-bsc/acc_ramp.c b/src/osmo-bsc/acc.c
similarity index 99%
rename from src/osmo-bsc/acc_ramp.c
rename to src/osmo-bsc/acc.c
index 761ab093c..a1941e42e 100644
--- a/src/osmo-bsc/acc_ramp.c
+++ b/src/osmo-bsc/acc.c
@@ -24,7 +24,7 @@
 #include <stdbool.h>
 
 #include <osmocom/bsc/debug.h>
-#include <osmocom/bsc/acc_ramp.h>
+#include <osmocom/bsc/acc.h>
 #include <osmocom/bsc/gsm_data.h>
 #include <osmocom/bsc/chan_alloc.h>
 #include <osmocom/bsc/signal.h>
diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c
index 11e51bec7..9cc76730e 100644
--- a/src/osmo-bsc/bsc_vty.c
+++ b/src/osmo-bsc/bsc_vty.c
@@ -64,7 +64,7 @@
 #include <osmocom/bsc/handover_cfg.h>
 #include <osmocom/bsc/handover_vty.h>
 #include <osmocom/bsc/gsm_04_08_rr.h>
-#include <osmocom/bsc/acc_ramp.h>
+#include <osmocom/bsc/acc.h>
 #include <osmocom/bsc/meas_feed.h>
 #include <osmocom/bsc/neighbor_ident.h>
 #include <osmocom/bsc/handover.h>
diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c
index 13d0f4673..fe78e8e8c 100644
--- a/src/osmo-bsc/system_information.c
+++ b/src/osmo-bsc/system_information.c
@@ -39,7 +39,7 @@
 #include <osmocom/bsc/rest_octets.h>
 #include <osmocom/bsc/arfcn_range_encode.h>
 #include <osmocom/bsc/gsm_04_08_rr.h>
-#include <osmocom/bsc/acc_ramp.h>
+#include <osmocom/bsc/acc.h>
 #include <osmocom/bsc/neighbor_ident.h>
 #include <osmocom/bsc/bts.h>
 
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 683c227ef..fd03cb384 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -48,7 +48,7 @@ bs11_config_SOURCES = \
 
 bs11_config_LDADD = \
 	$(top_builddir)/src/osmo-bsc/abis_nm.o \
-	$(top_builddir)/src/osmo-bsc/acc_ramp.o \
+	$(top_builddir)/src/osmo-bsc/acc.o \
 	$(top_builddir)/src/osmo-bsc/bts.o \
 	$(top_builddir)/src/osmo-bsc/bts_trx.o \
 	$(top_builddir)/src/osmo-bsc/bts_siemens_bs11.o \
@@ -121,7 +121,7 @@ meas_json_SOURCES = \
 
 meas_json_LDADD = \
 	$(top_builddir)/src/osmo-bsc/abis_nm.o \
-	$(top_builddir)/src/osmo-bsc/acc_ramp.o \
+	$(top_builddir)/src/osmo-bsc/acc.o \
 	$(top_builddir)/src/osmo-bsc/bts.o \
 	$(top_builddir)/src/osmo-bsc/bts_trx.o \
 	$(top_builddir)/src/osmo-bsc/gsm_data.o \
diff --git a/tests/abis/Makefile.am b/tests/abis/Makefile.am
index 031d689f5..a245b51c8 100644
--- a/tests/abis/Makefile.am
+++ b/tests/abis/Makefile.am
@@ -26,7 +26,7 @@ abis_test_SOURCES = \
 
 abis_test_LDADD = \
 	$(top_builddir)/src/osmo-bsc/abis_nm.o \
-	$(top_builddir)/src/osmo-bsc/acc_ramp.o \
+	$(top_builddir)/src/osmo-bsc/acc.o \
 	$(top_builddir)/src/osmo-bsc/bts.o \
 	$(top_builddir)/src/osmo-bsc/bts_trx.o \
 	$(top_builddir)/src/osmo-bsc/gsm_data.o \
diff --git a/tests/bsc/Makefile.am b/tests/bsc/Makefile.am
index 282f60333..468c0321e 100644
--- a/tests/bsc/Makefile.am
+++ b/tests/bsc/Makefile.am
@@ -34,7 +34,7 @@ bsc_test_SOURCES = \
 
 bsc_test_LDADD = \
 	$(top_builddir)/src/osmo-bsc/abis_nm.o \
-	$(top_builddir)/src/osmo-bsc/acc_ramp.o \
+	$(top_builddir)/src/osmo-bsc/acc.o \
 	$(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \
 	$(top_builddir)/src/osmo-bsc/osmo_bsc_filter.o \
 	$(top_builddir)/src/osmo-bsc/bsc_subscriber.o \
diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am
index 4e223925b..66e407259 100644
--- a/tests/gsm0408/Makefile.am
+++ b/tests/gsm0408/Makefile.am
@@ -24,7 +24,7 @@ gsm0408_test_SOURCES = \
 
 gsm0408_test_LDADD = \
 	$(top_builddir)/src/osmo-bsc/abis_nm.o \
-	$(top_builddir)/src/osmo-bsc/acc_ramp.o \
+	$(top_builddir)/src/osmo-bsc/acc.o \
 	$(top_builddir)/src/osmo-bsc/gsm_04_08_rr.o \
 	$(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \
 	$(top_builddir)/src/osmo-bsc/bts.o \
diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am
index 661b3d29c..87981d995 100644
--- a/tests/handover/Makefile.am
+++ b/tests/handover/Makefile.am
@@ -47,7 +47,7 @@ handover_test_LDADD = \
 	$(top_builddir)/src/osmo-bsc/abis_om2000.o \
 	$(top_builddir)/src/osmo-bsc/abis_om2000_vty.o \
 	$(top_builddir)/src/osmo-bsc/abis_rsl.o \
-	$(top_builddir)/src/osmo-bsc/acc_ramp.o \
+	$(top_builddir)/src/osmo-bsc/acc.o \
 	$(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \
 	$(top_builddir)/src/osmo-bsc/assignment_fsm.o \
 	$(top_builddir)/src/osmo-bsc/bsc_ctrl_commands.o \
diff --git a/tests/nanobts_omlattr/Makefile.am b/tests/nanobts_omlattr/Makefile.am
index 67d059f35..1cdcc50a1 100644
--- a/tests/nanobts_omlattr/Makefile.am
+++ b/tests/nanobts_omlattr/Makefile.am
@@ -24,7 +24,7 @@ nanobts_omlattr_test_SOURCES = \
 
 nanobts_omlattr_test_LDADD = \
 	$(top_builddir)/src/osmo-bsc/abis_nm.o \
-	$(top_builddir)/src/osmo-bsc/acc_ramp.o \
+	$(top_builddir)/src/osmo-bsc/acc.o \
 	$(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \
 	$(top_builddir)/src/osmo-bsc/bts.o \
 	$(top_builddir)/src/osmo-bsc/bts_trx.o \