diff --git a/debian/ostree-boot.install b/debian/ostree-boot.install
index 7701a276..ed9ffc60 100644
--- a/debian/ostree-boot.install
+++ b/debian/ostree-boot.install
@@ -3,6 +3,6 @@ etc/grub.d/15_ostree
 lib/systemd/system/ostree-prepare-root.service
 lib/systemd/system/ostree-remount.service
 usr/lib/dracut/modules.d/98ostree
-usr/lib/ostree/grub2-15_ostree
+usr/lib/libostree/grub2-15_ostree
 usr/lib/ostree/ostree-prepare-root
 usr/lib/ostree/ostree-remount
diff --git a/debian/ostree-tests.install b/debian/ostree-tests.install
index f28de121..47ef1484 100644
--- a/debian/ostree-tests.install
+++ b/debian/ostree-tests.install
@@ -1,3 +1,3 @@
 usr/lib/installed-tests/libostree
-usr/lib/ostree/ostree-trivial-httpd
+usr/lib/libostree/ostree-trivial-httpd
 usr/share/installed-tests/libostree
diff --git a/debian/ostree-tests.lintian-overrides b/debian/ostree-tests.lintian-overrides
index 4ff6b45e..2766ed7b 100644
--- a/debian/ostree-tests.lintian-overrides
+++ b/debian/ostree-tests.lintian-overrides
@@ -1,10 +1,10 @@
 # This is deliberate: it's just some random signed file to be verified, and
 # upstream happens to have used the text of the LGPL as the signed file
-ostree-tests: extra-license-file usr/lib/installed-tests/ostree/gpg-verify-data/lgpl2
-ostree-tests: extra-license-file usr/lib/installed-tests/ostree/gpg-verify-data/lgpl2.sig
+ostree-tests: extra-license-file usr/lib/installed-tests/libostree/gpg-verify-data/lgpl2
+ostree-tests: extra-license-file usr/lib/installed-tests/libostree/gpg-verify-data/lgpl2.sig
 
 # This is deliberate, working around the assumption of recursive make
-ostree-tests: symlink-is-self-recursive usr/lib/installed-tests/ostree/tests .
+ostree-tests: symlink-is-self-recursive usr/lib/installed-tests/libostree/tests .
 
 # We won't run this on sparc64 currently
-[sparc64]: missing-dep-for-interpreter gjs => gjs (usr/lib/installed-tests/ostree/corrupt-repo-ref.js)
+[sparc64]: missing-dep-for-interpreter gjs => gjs (usr/lib/installed-tests/libostree/corrupt-repo-ref.js)
diff --git a/debian/rules b/debian/rules
index 4fc93776..d9a3f0b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,7 +40,7 @@ override_dh_auto_install:
 
 override_dh_install:
 	rm -f debian/tmp/usr/lib/*/*.la
-	rm -f debian/tmp/usr/lib/installed-tests/ostree/*.la
+	rm -f debian/tmp/usr/lib/installed-tests/libostree/*.la
 	:
 	# FIXME: when someone documents how to test these (#824649) they
 	# should be installed in a new ostree-boot package: see
@@ -50,7 +50,7 @@ override_dh_install:
 	rm -f debian/tmp/lib/systemd/system/ostree-prepare-root.service
 	rm -f debian/tmp/lib/systemd/system/ostree-remount.service
 	rm -fr debian/tmp/usr/lib/dracut/modules.d/98ostree/
-	rm -f debian/tmp/usr/lib/ostree/grub2-15_ostree
+	rm -f debian/tmp/usr/lib/libostree/grub2-15_ostree
 	rm -f debian/tmp/usr/lib/ostree/ostree-prepare-root
 	rm -f debian/tmp/usr/lib/ostree/ostree-remount
 	: