diff --git a/distro/pkg/deb/control b/distro/pkg/deb/control
index bdcbd19..2a19c80 100644
--- a/distro/pkg/deb/control
+++ b/distro/pkg/deb/control
@@ -1,4 +1,4 @@
-Source: libyang2
+Source: libyang3
 Section: libs
 Homepage: https://github.com/CESNET/libyang/
 Maintainer: Ondřej Surý <ondrej@debian.org>
@@ -12,7 +12,7 @@
 Vcs-Browser: https://github.com/CESNET/libyang/tree/master
 Vcs-Git: https://github.com/CESNET/libyang.git
 
-Package: libyang2
+Package: libyang3
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Architecture: any
@@ -29,11 +29,11 @@
  The library is implemented in C and provides an API for other software
  to use in processing configurations.
 
-Package: libyang2-dev
+Package: libyang-dev
 Depends: libpcre2-dev,
-         libyang2 (= ${binary:Version}),
+         libyang3 (= ${binary:Version}),
          ${misc:Depends}
-Conflicts: libyang-dev
+Conflicts: libyang2-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
@@ -49,12 +49,12 @@
  This package contains the C headers, a pkgconfig file, and .so entry point
  for libyang.
 
-Package: libyang2-tools
-Depends: libyang2 (= ${binary:Version}),
+Package: libyang-tools
+Depends: libyang3 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: libyang-tools (<< ${source:Version})
-Replaces: libyang-tools (<< ${source:Version})
+Breaks: libyang2-tools (<< ${source:Version})
+Replaces: libyang2-tools (<< ${source:Version})
 Section: devel
 Architecture: any
 Multi-Arch: foreign
@@ -63,13 +63,3 @@
  during the creation of IETF YANG schemas.  The tools are not generally
  useful for normal operation where libyang primarily processes configuration
  data, not schemas.
-
-Package: libyang-tools
-Depends: libyang2-tools (>= ${source:Version}),
-         ${misc:Depends}
-Section: oldlibs
-Architecture: all
-Multi-Arch: foreign
-Description: parser toolkit for IETF YANG data modeling [dummy package]
- This is empty dependency package to pull the executable tools.  It's
- safe to remove.
diff --git a/distro/pkg/deb/libyang2-dev.install b/distro/pkg/deb/libyang-dev.install
similarity index 100%
rename from distro/pkg/deb/libyang2-dev.install
rename to distro/pkg/deb/libyang-dev.install
diff --git a/distro/pkg/deb/libyang2-tools.examples b/distro/pkg/deb/libyang-tools.examples
similarity index 100%
rename from distro/pkg/deb/libyang2-tools.examples
rename to distro/pkg/deb/libyang-tools.examples
diff --git a/distro/pkg/deb/libyang2-tools.install b/distro/pkg/deb/libyang-tools.install
similarity index 100%
rename from distro/pkg/deb/libyang2-tools.install
rename to distro/pkg/deb/libyang-tools.install
diff --git a/distro/pkg/deb/libyang2.install b/distro/pkg/deb/libyang3.install
similarity index 100%
rename from distro/pkg/deb/libyang2.install
rename to distro/pkg/deb/libyang3.install
diff --git a/distro/pkg/deb/libyang2.symbols b/distro/pkg/deb/libyang3.symbols
similarity index 100%
rename from distro/pkg/deb/libyang2.symbols
rename to distro/pkg/deb/libyang3.symbols
diff --git a/distro/pkg/deb/tests/control b/distro/pkg/deb/tests/control
index e4613e6..ca73c4a 100644
--- a/distro/pkg/deb/tests/control
+++ b/distro/pkg/deb/tests/control
@@ -1,3 +1,3 @@
 Tests: yanglint
 Depends: gzip,
-         libyang2-tools
+         libyang-tools
diff --git a/distro/pkg/deb/tests/yanglint b/distro/pkg/deb/tests/yanglint
index eda5573..30719e0 100755
--- a/distro/pkg/deb/tests/yanglint
+++ b/distro/pkg/deb/tests/yanglint
@@ -8,10 +8,10 @@
 TESTFILE="${TESTDIR}/ietf-interfaces.yang"
 
 # Unpack or copy the test file
-if test -f /usr/share/doc/libyang2-tools/examples/ietf-interfaces.yang.gz; then
-	gunzip -c < /usr/share/doc/libyang2-tools/examples/ietf-interfaces.yang.gz > "${TESTFILE}"
+if test -f /usr/share/doc/libyang-tools/examples/ietf-interfaces.yang.gz; then
+	gunzip -c < /usr/share/doc/libyang-tools/examples/ietf-interfaces.yang.gz > "${TESTFILE}"
 else
-	cp /usr/share/doc/libyang2-tools/examples/ietf-interfaces.yang "${TESTFILE}"
+	cp /usr/share/doc/libyang-tools/examples/ietf-interfaces.yang "${TESTFILE}"
 fi
 
 # Lint the test file
diff --git a/distro/pkg/rpm/libyang.spec b/distro/pkg/rpm/libyang.spec
index f57ef91..5af0cad 100644
--- a/distro/pkg/rpm/libyang.spec
+++ b/distro/pkg/rpm/libyang.spec
@@ -90,8 +90,8 @@
 
 %files
 %license LICENSE
-%{_libdir}/libyang.so.2
-%{_libdir}/libyang.so.2.*
+%{_libdir}/libyang.so.3
+%{_libdir}/libyang.so.3.*
 %{_datadir}/yang/modules/libyang/*.yang
 %dir %{_datadir}/yang/
 %dir %{_datadir}/yang/modules/