diff --git a/Makefile.am b/Makefile.am
index 6d2c442..53fe770 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,9 +4,9 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 AM_CPPFLAGS = -DDATADIR='"$(datadir)"' -DLIBEXECDIR='"$(libexecdir)"'
 AM_CFLAGS = $(WARN_CFLAGS)
 
-bin_PROGRAMS = bubblewrap
+bin_PROGRAMS = bwrap
 
-bubblewrap_SOURCES = \
+bwrap_SOURCES = \
 	bubblewrap.c \
 	bind-mount.h \
 	bind-mount.c \
@@ -16,5 +16,5 @@ bubblewrap_SOURCES = \
 	utils.c \
 	$(NULL)
 
-bubblewrap_CFLAGS = $(AM_CFLAGS)
-bubblewrap_LDFLAGS =
+bwrap_CFLAGS = $(AM_CFLAGS)
+bwrap_LDFLAGS =
diff --git a/demos/bubblewrap-shell.sh b/demos/bubblewrap-shell.sh
index f44fb7a..2445239 100755
--- a/demos/bubblewrap-shell.sh
+++ b/demos/bubblewrap-shell.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # Use bubblewrap to run /bin/sh in the host's rootfs.
 set -euo pipefail
-exec bubblewrap --mount-ro-bind /usr /usr \
+exec bwrap --mount-ro-bind /usr /usr \
 	   --make-dir /tmp \
 	   --mount-proc /proc \
 	   --mount-dev /dev \
diff --git a/demos/xdg-app-run.sh b/demos/xdg-app-run.sh
index 39a3d2e..e92dbd1 100755
--- a/demos/xdg-app-run.sh
+++ b/demos/xdg-app-run.sh
@@ -29,7 +29,7 @@ runtime=runtime/org.gnome.Platform/x86_64/master
 EOF
 
 
-./bubblewrap \
+exec ../bwrap \
     --mount-ro-bind ~/.local/share/xdg-app/runtime/org.gnome.Platform/x86_64/master/active/files /usr \
     --lock-file /usr/.ref \
     --mount-ro-bind ~/.local/share/xdg-app/app/org.gnome.Weather/x86_64/master/active/files/ /app \
@@ -62,7 +62,7 @@ EOF
     --mount-bind ~/.config/dconf ~/.config/dconf \
     --mount-bind /run/user/`id -u`/dconf /run/user/`id -u`/dconf  \
     --unshare-pid \
-    /bin/sh 10< ${APPINFO}
+    gnome-weather 10< ${APPINFO}
 
 
 # TODO: