diff --git a/contrib/libosmocore.spec.in b/contrib/libosmocore.spec.in
index ebd1938..60ca397 100644
--- a/contrib/libosmocore.spec.in
+++ b/contrib/libosmocore.spec.in
@@ -60,12 +60,12 @@
 for testing GSM authentication, as well as "osmo-config-merge", a tool
 for merging Osmocom configuration files.
 
-%package -n libosmocodec0
+%package -n libosmocodec4
 Summary:        GSM 06.10, 06.20, 06.60, 06.90 codec library
 License:        GPL-2.0-or-later
 Group:          System/Libraries
 
-%description -n libosmocodec0
+%description -n libosmocodec4
 The libosmocodec library contains an implementation of multiple
 GSM codecs:
 
@@ -78,7 +78,7 @@
 Summary:        Development files for the Osmocom GSM codec library
 License:        GPL-2.0-or-later
 Group:          Development/Libraries/C and C++
-Requires:       libosmocodec0 = %version
+Requires:       libosmocodec4 = %version
 
 %description -n libosmocodec-devel
 The libosmocodec library contains an implementation of multiple
@@ -115,13 +115,13 @@
 This subpackage contains libraries and header files for developing
 applications that want to make use of libosmocoding.
 
-%package -n libosmocore20
+%package -n libosmocore21
 Summary:        Osmocom core library
 # crc16.c has GPL2-only clauses, the rest (*.c) is GPL-2.0+
 License:        GPL-2.0-only AND GPL-2.0-or-later
 Group:          System/Libraries
 
-%description -n libosmocore20
+%description -n libosmocore21
 libosmocore is a library with various utility functions shared
 between OpenBSC and OsmocomBB.
 
@@ -130,7 +130,7 @@
 # crc16.h has GPL2-only clauses, the rest (*.h) is GPL-2.0+
 License:        GPL-2.0-only AND GPL-2.0-or-later
 Group:          Development/Libraries/C and C++
-Requires:       libosmocore20 = %version
+Requires:       libosmocore21 = %version
 Requires:       libtalloc-devel
 Requires:       lksctp-tools-devel
 
@@ -193,12 +193,12 @@
 This subpackage contains libraries and header files for developing
 applications that want to make use of libosmogb.
 
-%package -n libosmogsm18
+%package -n libosmogsm20
 Summary:        Osmocom GSM utility library
 License:        GPL-2.0-or-later AND AGPL-3.0-or-later
 Group:          System/Libraries
 
-%description -n libosmogsm18
+%description -n libosmogsm20
 libosmocore is a package with various utility functions that were
 originally developed as part of the OpenBSC project.
 
@@ -213,7 +213,7 @@
 License:        GPL-2.0-or-later AND AGPL-3.0-or-later
 Group:          Development/Libraries/C and C++
 Requires:       libosmocore-devel = %version
-Requires:       libosmogsm18 = %version
+Requires:       libosmogsm20 = %version
 Requires:       libosmoisdn-devel = %version
 Requires:       libosmoisdn0 = %version
 
@@ -281,12 +281,12 @@
 This subpackage contains libraries and header files for developing
 applications that want to make use of libosmosim.
 
-%package -n libosmovty9
+%package -n libosmovty13
 Summary:        Osmocom VTY interface library
 License:        GPL-2.0-or-later
 Group:          System/Libraries
 
-%description -n libosmovty9
+%description -n libosmovty13
 libosmocore is a package with various utility functions that were
 originally developed as part of the OpenBSC project.
 
@@ -298,7 +298,7 @@
 License:        GPL-2.0-or-later
 Group:          Development/Libraries/C and C++
 Requires:       libosmocore-devel = %version
-Requires:       libosmovty9 = %version
+Requires:       libosmovty13 = %version
 
 %description -n libosmovty-devel
 The libosmovty library implements the interactive command-line on the
@@ -363,24 +363,24 @@
 %check
 make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
 
-%post   -n libosmocodec0 -p /sbin/ldconfig
-%postun -n libosmocodec0 -p /sbin/ldconfig
+%post   -n libosmocodec4 -p /sbin/ldconfig
+%postun -n libosmocodec4 -p /sbin/ldconfig
 %post   -n libosmocoding0 -p /sbin/ldconfig
 %postun -n libosmocoding0 -p /sbin/ldconfig
-%post   -n libosmocore20 -p /sbin/ldconfig
-%postun -n libosmocore20 -p /sbin/ldconfig
+%post   -n libosmocore21 -p /sbin/ldconfig
+%postun -n libosmocore21 -p /sbin/ldconfig
 %post   -n libosmoctrl0 -p /sbin/ldconfig
 %postun -n libosmoctrl0 -p /sbin/ldconfig
 %post   -n libosmogb14 -p /sbin/ldconfig
 %postun -n libosmogb14 -p /sbin/ldconfig
-%post   -n libosmogsm18 -p /sbin/ldconfig
-%postun -n libosmogsm18 -p /sbin/ldconfig
+%post   -n libosmogsm20 -p /sbin/ldconfig
+%postun -n libosmogsm20 -p /sbin/ldconfig
 %post   -n libosmoisdn0 -p /sbin/ldconfig
 %postun -n libosmoisdn0 -p /sbin/ldconfig
 %post   -n libosmosim2 -p /sbin/ldconfig
 %postun -n libosmosim2 -p /sbin/ldconfig
-%post   -n libosmovty9 -p /sbin/ldconfig
-%postun -n libosmovty9 -p /sbin/ldconfig
+%post   -n libosmovty13 -p /sbin/ldconfig
+%postun -n libosmovty13 -p /sbin/ldconfig
 %post   -n libosmousb0 -p /sbin/ldconfig
 %postun -n libosmousb0 -p /sbin/ldconfig
 
@@ -388,9 +388,9 @@
 %defattr(-,root,root)
 %_bindir/osmo-*
 
-%files -n libosmocodec0
+%files -n libosmocodec4
 %defattr(-,root,root)
-%_libdir/libosmocodec.so.0*
+%_libdir/libosmocodec.so.4*
 
 %files -n libosmocodec-devel
 %defattr(-,root,root)
@@ -412,9 +412,9 @@
 %_libdir/libosmocoding.so
 %_libdir/pkgconfig/libosmocoding.pc
 
-%files -n libosmocore20
+%files -n libosmocore21
 %defattr(-,root,root)
-%_libdir/libosmocore.so.20*
+%_libdir/libosmocore.so.21*
 
 %files -n libosmocore-devel
 %defattr(-,root,root)
@@ -450,9 +450,9 @@
 %_libdir/libosmogb.so
 %_libdir/pkgconfig/libosmogb.pc
 
-%files -n libosmogsm18
+%files -n libosmogsm20
 %defattr(-,root,root)
-%_libdir/libosmogsm.so.18*
+%_libdir/libosmogsm.so.20*
 
 %files -n libosmogsm-devel
 %defattr(-,root,root)
@@ -487,9 +487,9 @@
 %_libdir/libosmosim.so
 %_libdir/pkgconfig/libosmosim.pc
 
-%files -n libosmovty9
+%files -n libosmovty13
 %defattr(-,root,root)
-%_libdir/libosmovty.so.9*
+%_libdir/libosmovty.so.13*
 
 %files -n libosmovty-devel
 %defattr(-,root,root)