diff --git a/src/host/layer2/.gitignore b/src/host/layer23/.gitignore
similarity index 100%
rename from src/host/layer2/.gitignore
rename to src/host/layer23/.gitignore
diff --git a/src/host/layer2/COPYING b/src/host/layer23/COPYING
similarity index 100%
rename from src/host/layer2/COPYING
rename to src/host/layer23/COPYING
diff --git a/src/host/layer2/Makefile.am b/src/host/layer23/Makefile.am
similarity index 100%
rename from src/host/layer2/Makefile.am
rename to src/host/layer23/Makefile.am
diff --git a/src/host/layer2/configure.ac b/src/host/layer23/configure.ac
similarity index 94%
rename from src/host/layer2/configure.ac
rename to src/host/layer23/configure.ac
index cbed1c075..177d96815 100644
--- a/src/host/layer2/configure.ac
+++ b/src/host/layer23/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script
 AC_INIT
 
-AM_INIT_AUTOMAKE(layer2, 0.0.0)
+AM_INIT_AUTOMAKE(layer23, 0.0.0)
 
 dnl kernel style compile messages
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/src/host/layer2/include/Makefile.am b/src/host/layer23/include/Makefile.am
similarity index 100%
rename from src/host/layer2/include/Makefile.am
rename to src/host/layer23/include/Makefile.am
diff --git a/src/host/layer2/include/l1a_l23_interface.h b/src/host/layer23/include/l1a_l23_interface.h
similarity index 100%
rename from src/host/layer2/include/l1a_l23_interface.h
rename to src/host/layer23/include/l1a_l23_interface.h
diff --git a/src/host/layer2/include/osmocom/Makefile.am b/src/host/layer23/include/osmocom/Makefile.am
similarity index 100%
rename from src/host/layer2/include/osmocom/Makefile.am
rename to src/host/layer23/include/osmocom/Makefile.am
diff --git a/src/host/layer2/include/osmocom/debug.h b/src/host/layer23/include/osmocom/debug.h
similarity index 100%
rename from src/host/layer2/include/osmocom/debug.h
rename to src/host/layer23/include/osmocom/debug.h
diff --git a/src/host/layer2/include/osmocom/l1ctl.h b/src/host/layer23/include/osmocom/l1ctl.h
similarity index 100%
rename from src/host/layer2/include/osmocom/l1ctl.h
rename to src/host/layer23/include/osmocom/l1ctl.h
diff --git a/src/host/layer2/include/osmocom/lapdm.h b/src/host/layer23/include/osmocom/lapdm.h
similarity index 100%
rename from src/host/layer2/include/osmocom/lapdm.h
rename to src/host/layer23/include/osmocom/lapdm.h
diff --git a/src/host/layer2/include/osmocom/layer3.h b/src/host/layer23/include/osmocom/layer3.h
similarity index 100%
rename from src/host/layer2/include/osmocom/layer3.h
rename to src/host/layer23/include/osmocom/layer3.h
diff --git a/src/host/layer2/include/osmocom/osmocom_data.h b/src/host/layer23/include/osmocom/osmocom_data.h
similarity index 100%
rename from src/host/layer2/include/osmocom/osmocom_data.h
rename to src/host/layer23/include/osmocom/osmocom_data.h
diff --git a/src/host/layer2/include/osmocom/rslms.h b/src/host/layer23/include/osmocom/rslms.h
similarity index 100%
rename from src/host/layer2/include/osmocom/rslms.h
rename to src/host/layer23/include/osmocom/rslms.h
diff --git a/src/host/layer2/src/Makefile.am b/src/host/layer23/src/Makefile.am
similarity index 52%
rename from src/host/layer2/src/Makefile.am
rename to src/host/layer23/src/Makefile.am
index d1f7f129a..aed8e2474 100644
--- a/src/host/layer2/src/Makefile.am
+++ b/src/host/layer23/src/Makefile.am
@@ -4,6 +4,6 @@ AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS)
 noinst_LIBRARIES = libosmocom.a
 libosmocom_a_SOURCES = libosmocom/debug.c 
 
-sbin_PROGRAMS = layer2
-layer2_SOURCES = layer2_main.c l1ctl.c gsmtap_util.c lapdm.c rslms.c layer3.c
-layer2_LDADD = libosmocom.a $(LIBOSMOCORE_LIBS)
+sbin_PROGRAMS = layer23
+layer23_SOURCES = main.c l1ctl.c gsmtap_util.c lapdm.c rslms.c layer3.c
+layer23_LDADD = libosmocom.a $(LIBOSMOCORE_LIBS)
diff --git a/src/host/layer2/src/gsmtap_util.c b/src/host/layer23/src/gsmtap_util.c
similarity index 100%
rename from src/host/layer2/src/gsmtap_util.c
rename to src/host/layer23/src/gsmtap_util.c
diff --git a/src/host/layer2/src/gsmtap_util.h b/src/host/layer23/src/gsmtap_util.h
similarity index 100%
rename from src/host/layer2/src/gsmtap_util.h
rename to src/host/layer23/src/gsmtap_util.h
diff --git a/src/host/layer2/src/l1ctl.c b/src/host/layer23/src/l1ctl.c
similarity index 100%
rename from src/host/layer2/src/l1ctl.c
rename to src/host/layer23/src/l1ctl.c
diff --git a/src/host/layer2/src/lapdm.c b/src/host/layer23/src/lapdm.c
similarity index 100%
rename from src/host/layer2/src/lapdm.c
rename to src/host/layer23/src/lapdm.c
diff --git a/src/host/layer2/src/layer3.c b/src/host/layer23/src/layer3.c
similarity index 100%
rename from src/host/layer2/src/layer3.c
rename to src/host/layer23/src/layer3.c
diff --git a/src/host/layer2/src/libosmocom/debug.c b/src/host/layer23/src/libosmocom/debug.c
similarity index 100%
rename from src/host/layer2/src/libosmocom/debug.c
rename to src/host/layer23/src/libosmocom/debug.c
diff --git a/src/host/layer2/src/layer2_main.c b/src/host/layer23/src/main.c
similarity index 100%
rename from src/host/layer2/src/layer2_main.c
rename to src/host/layer23/src/main.c
diff --git a/src/host/layer2/src/rslms.c b/src/host/layer23/src/rslms.c
similarity index 100%
rename from src/host/layer2/src/rslms.c
rename to src/host/layer23/src/rslms.c