diff --git a/debian/control b/debian/control
index 1c295cb..5231bc5 100644
--- a/debian/control
+++ b/debian/control
@@ -37,10 +37,9 @@ Vcs-Git: https://salsa.debian.org/printing-team/cups.git
 Homepage: https://github.com/OpenPrinting/cups/
 Rules-Requires-Root: no
 
-Package: libcups2t64
-Provides: ${t64:Provides}
-Replaces: libcups2
-Breaks: libcups2 (<< ${source:Version})
+Package: libcups2
+Provides: libcups2t64
+Replaces: libcups2t64
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -72,7 +71,7 @@ Depends:
  cups-server-common (>= ${source:Version}),
  debconf | debconf-2.0,
  ghostscript,
- libcups2t64 (= ${binary:Version}),
+ libcups2 (= ${binary:Version}),
  poppler-utils,
  procps,
  ${misc:Depends},
@@ -135,7 +134,7 @@ Multi-Arch: foreign
 Depends:
  adduser,
  cups-common (>= ${source:Version}),
- libcups2t64 (= ${binary:Version}),
+ libcups2 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Suggests:
@@ -172,7 +171,7 @@ Multi-Arch: foreign
 Depends:
  cups-daemon (>= ${binary:Version}),
  cups-filters-core-drivers,
- libcups2t64 (= ${binary:Version}),
+ libcups2 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
@@ -200,7 +199,7 @@ Pre-Depends:
 Depends:
  adduser,
  bc,
- libcups2t64 (= ${binary:Version}),
+ libcups2 (= ${binary:Version}),
  lsb-base,
  procps,
  ssl-cert,
@@ -242,7 +241,7 @@ Package: cups-ipp-utils
 Architecture: any
 Multi-Arch: foreign
 Depends:
- libcups2t64 (= ${binary:Version}),
+ libcups2 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
@@ -295,7 +294,7 @@ Multi-Arch: same
 Section: libdevel
 Depends:
  dpkg-dev,
- libcups2t64 (= ${binary:Version}),
+ libcups2 (= ${binary:Version}),
  libcupsimage2-dev (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
@@ -310,15 +309,14 @@ Description: Common UNIX Printing System(tm) - Development files CUPS library
  with cups from different programming languages (Perl, Java, and
  PHP).
 
-Package: libcupsimage2t64
-Provides: ${t64:Provides}
-Replaces: libcupsimage2
-Breaks: libcupsimage2 (<< ${source:Version})
+Package: libcupsimage2
+Provides: libcupsimage2t64
+Replaces: libcupsimage2t64
 Architecture: any
 Multi-Arch: same
 Section: libs
 Depends:
- libcups2t64 (= ${binary:Version}),
+ libcups2 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
@@ -340,7 +338,7 @@ Multi-Arch: same
 Section: libdevel
 Depends:
  libcups2-dev (= ${binary:Version}),
- libcupsimage2t64 (= ${binary:Version}),
+ libcupsimage2 (= ${binary:Version}),
  libjpeg-dev,
  libpng-dev,
  libtiff-dev,
diff --git a/debian/libcups2t64.README.Debian b/debian/libcups2.README.Debian
similarity index 100%
rename from debian/libcups2t64.README.Debian
rename to debian/libcups2.README.Debian
diff --git a/debian/libcups2t64.examples b/debian/libcups2.examples
similarity index 100%
rename from debian/libcups2t64.examples
rename to debian/libcups2.examples
diff --git a/debian/libcups2t64.install b/debian/libcups2.install
similarity index 100%
rename from debian/libcups2t64.install
rename to debian/libcups2.install
diff --git a/debian/libcups2.lintian-overrides b/debian/libcups2.lintian-overrides
new file mode 100644
index 0000000..b522151
--- /dev/null
+++ b/debian/libcups2.lintian-overrides
@@ -0,0 +1 @@
+libcups2: package-name-doesnt-match-sonames libcups2
diff --git a/debian/libcups2t64.symbols b/debian/libcups2.symbols
similarity index 99%
rename from debian/libcups2t64.symbols
rename to debian/libcups2.symbols
index fd047e0..7d067bd 100644
--- a/debian/libcups2t64.symbols
+++ b/debian/libcups2.symbols
@@ -1,5 +1,5 @@
-libcups.so.2 libcups2t64 #MINVER#
-* Build-Depends-Package: libcups2t64-dev
+libcups.so.2 libcups2 #MINVER#
+* Build-Depends-Package: libcups2-dev
 # Keep these at the latest upstream release
  (optional|regex)"^_pwg.*@Base$" 2.3~b6
  (optional|regex)"^_cups.*@Base$" 2.3~b6
diff --git a/debian/libcups2t64.lintian-overrides b/debian/libcups2t64.lintian-overrides
deleted file mode 100644
index 0d731fa..0000000
--- a/debian/libcups2t64.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libcups2t64: package-name-doesnt-match-sonames libcups2
diff --git a/debian/libcupsimage2-dev.substvars b/debian/libcupsimage2-dev.substvars
new file mode 100644
index 0000000..483fe24
--- /dev/null
+++ b/debian/libcupsimage2-dev.substvars
@@ -0,0 +1 @@
+misc:Depends=libcupsimage2 (= ${binary:Version})
diff --git a/debian/libcupsimage2t64.install b/debian/libcupsimage2.install
similarity index 100%
rename from debian/libcupsimage2t64.install
rename to debian/libcupsimage2.install
diff --git a/debian/libcupsimage2.lintian-overrides b/debian/libcupsimage2.lintian-overrides
new file mode 100644
index 0000000..464149c
--- /dev/null
+++ b/debian/libcupsimage2.lintian-overrides
@@ -0,0 +1 @@
+libcupsimage2: package-name-doesnt-match-sonames libcupsimage2
diff --git a/debian/libcupsimage2t64.symbols b/debian/libcupsimage2.symbols
similarity index 82%
rename from debian/libcupsimage2t64.symbols
rename to debian/libcupsimage2.symbols
index 0026dc6..130b603 100644
--- a/debian/libcupsimage2t64.symbols
+++ b/debian/libcupsimage2.symbols
@@ -1,5 +1,5 @@
-libcupsimage.so.2 libcupsimage2t64 #MINVER#
-* Build-Depends-Package: libcupsimage2t64-dev
+libcupsimage.so.2 libcupsimage2 #MINVER#
+* Build-Depends-Package: libcupsimage2-dev
 # Keep this one at the latest upstream release
  (optional|regex)|^_cups.*@Base$" 1.6.2
  cupsRasterClose@Base 1.4.0
diff --git a/debian/libcupsimage2t64.lintian-overrides b/debian/libcupsimage2t64.lintian-overrides
deleted file mode 100644
index 428742e..0000000
--- a/debian/libcupsimage2t64.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libcupsimage2t64: package-name-doesnt-match-sonames libcupsimage2
diff --git a/debian/rules b/debian/rules
index f751073..1eea226 100755
--- a/debian/rules
+++ b/debian/rules
@@ -276,8 +276,8 @@ override_dh_auto_clean:
 	[ ! -f Makedefs ] || make distclean
 
 override_dh_installdocs:
-	dh_installdocs -plibcupsimage2-dev --link-doc=libcupsimage2t64
-	dh_installdocs -pcups-bsd --link-doc=libcups2t64
+	dh_installdocs -plibcupsimage2-dev --link-doc=libcupsimage2
+	dh_installdocs -pcups-bsd --link-doc=libcups2
 	dh_installdocs --remaining-packages
 
 	rm -f debian/libcups2-dev/usr/share/doc/libcups2-dev/examples/scripting/php/*.o