diff --git a/src/l2tpd.c b/src/l2tpd.c
index 9d09dba..635394d 100644
--- a/src/l2tpd.c
+++ b/src/l2tpd.c
@@ -88,7 +88,7 @@ static int l2tpd_instance_start(struct l2tpd_instance *li)
 
 	INIT_LLIST_HEAD(&li->connections);
 
-	li->l2tp_ofd.when = BSC_FD_READ;
+	li->l2tp_ofd.when = OSMO_FD_READ;
 	li->l2tp_ofd.cb = l2tp_ip_read_cb;
 	li->l2tp_ofd.data = li;
 
diff --git a/src/l2tpd_socket.c b/src/l2tpd_socket.c
index a9ff563..efdb482 100644
--- a/src/l2tpd_socket.c
+++ b/src/l2tpd_socket.c
@@ -84,7 +84,7 @@ static int l2tp_sock_accept(struct osmo_fd *bfd, unsigned int flags)
 	}
 
 	conn_bfd->fd = rc;
-	conn_bfd->when = BSC_FD_READ;
+	conn_bfd->when = OSMO_FD_READ;
 
 	if (osmo_fd_register(conn_bfd) != 0) {
 		LOGP(state->log_class, LOGL_ERROR, "Failed to register new connection fd\n");
@@ -142,7 +142,7 @@ int l2tp_socket_init(struct l2tp_socket_state *state, const char *sock_path, int
 		return -1;
 	}
 
-	bfd->when = BSC_FD_READ;
+	bfd->when = OSMO_FD_READ;
 	bfd->cb = l2tp_sock_accept;
 
 	rc = osmo_fd_register(bfd);
diff --git a/src/test_connect.c b/src/test_connect.c
index 38aa127..5eb584b 100644
--- a/src/test_connect.c
+++ b/src/test_connect.c
@@ -58,7 +58,7 @@ int connect_bfd(struct osmo_fd *bfd, const char *sock_path)
 {
 	int rc = 0;
 
-	bfd->when = BSC_FD_READ;
+	bfd->when = OSMO_FD_READ;
 	bfd->cb = socket_read;
 	bfd->fd = osmo_sock_unix_init(SOCK_SEQPACKET, 0, sock_path,OSMO_SOCK_F_CONNECT);