diff --git a/openbsc/src/osmo-bsc/osmo_bsc_ctrl.c b/openbsc/src/osmo-bsc/osmo_bsc_ctrl.c
index ffde1b8..c23ed21 100644
--- a/openbsc/src/osmo-bsc/osmo_bsc_ctrl.c
+++ b/openbsc/src/osmo-bsc/osmo_bsc_ctrl.c
@@ -40,9 +40,9 @@
 {
 	struct ctrl_cmd *trap;
 	struct ctrl_handle *ctrl;
-	struct osmo_msc_data *msc_data;
+	struct bsc_msc_data *msc_data;
 
-	msc_data = (struct osmo_msc_data *) msc_con->write_queue.bfd.data;
+	msc_data = (struct bsc_msc_data *) msc_con->write_queue.bfd.data;
 	ctrl = msc_data->network->ctrl;
 
 	trap = ctrl_cmd_trap(cmd);
@@ -197,7 +197,7 @@
 
 void bsc_gen_location_state_trap(struct gsm_bts *bts)
 {
-	struct osmo_msc_data *msc;
+	struct bsc_msc_data *msc;
 
 	llist_for_each_entry(msc, &bts->network->bsc_data->mscs, entry)
 		generate_location_state_trap(bts, msc->msc_con);
@@ -517,7 +517,7 @@
 static int set_net_inform_msc(struct ctrl_cmd *cmd, void *data)
 {
 	struct gsm_network *net;
-	struct osmo_msc_data *msc;
+	struct bsc_msc_data *msc;
 
 	net = cmd->node;
 	llist_for_each_entry(msc, &net->bsc_data->mscs, entry) {