diff --git a/include/osmocom/hnbgw/context_map.h b/include/osmocom/hnbgw/context_map.h
index 3a145b6..97e1b09 100644
--- a/include/osmocom/hnbgw/context_map.h
+++ b/include/osmocom/hnbgw/context_map.h
@@ -79,6 +79,6 @@ context_map_alloc_by_hnb(struct hnb_context *hnb, uint32_t rua_ctx_id,
 struct hnbgw_context_map *
 context_map_by_cn(struct hnbgw_cnlink *cn, uint32_t scu_conn_id);
 
-void context_map_deactivate(struct hnbgw_context_map *map);
+void context_map_hnb_released(struct hnbgw_context_map *map);
 
 int context_map_init(struct hnb_gw *gw);
diff --git a/src/osmo-hnbgw/context_map.c b/src/osmo-hnbgw/context_map.c
index 96365fb..9816918 100644
--- a/src/osmo-hnbgw/context_map.c
+++ b/src/osmo-hnbgw/context_map.c
@@ -150,7 +150,7 @@ context_map_by_cn(struct hnbgw_cnlink *cn, uint32_t scu_conn_id)
 	return NULL;
 }
 
-void context_map_deactivate(struct hnbgw_context_map *map)
+void context_map_hnb_released(struct hnbgw_context_map *map)
 {
 	LOG_MAP(map, DMAIN, LOGL_INFO, "Deactivating\n");
 
diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c
index da6df43..322dabe 100644
--- a/src/osmo-hnbgw/hnbgw.c
+++ b/src/osmo-hnbgw/hnbgw.c
@@ -402,7 +402,7 @@ void hnb_context_release_ue_state(struct hnb_context *ctx)
 		 * map garbage collector works fine? */
 		llist_del(&map->hnb_list);
 		llist_del(&map->cn_list);
-		context_map_deactivate(map);
+		context_map_hnb_released(map);
 	}
 	ue_context_free_by_hnb(ctx->gw, ctx);
 }
diff --git a/src/osmo-hnbgw/hnbgw_rua.c b/src/osmo-hnbgw/hnbgw_rua.c
index 5581148..3af0ad6 100644
--- a/src/osmo-hnbgw/hnbgw_rua.c
+++ b/src/osmo-hnbgw/hnbgw_rua.c
@@ -313,7 +313,7 @@ static int rua_to_scu(struct hnb_context *hnb,
 	rc = osmo_sccp_user_sap_down(cn->sccp_user, &prim->oph);
 
 	if (map && release_context_map)
-		context_map_deactivate(map);
+		context_map_hnb_released(map);
 
 	return rc;
 }