diff --git a/Makefile.am b/Makefile.am
index c5bf00e..1d1a551 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,27 +1,27 @@
 SUBDIRS = lib
 
-bin_PROGRAMS = containerfs
+bin_PROGRAMS = fuse-overlayfs
 
 ACLOCAL_AMFLAGS = -Im4
 
-EXTRA_DIST = m4/gnulib-cache.m4 rpm/containerfs.spec.template autogen.sh
+EXTRA_DIST = m4/gnulib-cache.m4 rpm/fuse-overlayfs.spec.template autogen.sh
 
-containerfs_CFLAGS = -I . -I lib $(FUSE_CFLAGS)
-containerfs_LDFLAGS = $(FUSE_LIBS)
-containerfs_LDADD = lib/libgnu.a
-containerfs_SOURCES = main.c
+fuse_overlayfs_CFLAGS = -I . -I lib $(FUSE_CFLAGS)
+fuse_overlayfs_LDFLAGS = $(FUSE_LIBS)
+fuse_overlayfs_LDADD = lib/libgnu.a
+fuse_overlayfs_SOURCES = main.c
 
 WD := $(shell pwd)
 
-containerfs.spec: $(srcdir)/rpm/containerfs.spec.template
+fuse-overlayfs.spec: $(srcdir)/rpm/fuse-overlayfs.spec.template
 	sed -e 's|#VERSION#|$(VERSION)|g' < $< > $@
 
-rpm: dist-gzip containerfs.spec
+rpm: dist-gzip fuse-overlayfs.spec
 	echo $(VERSION)
 	$(MAKE) -C $(WD) dist-xz
-	rpmbuild -ba --define "_sourcedir $(WD)" --define "_specdir $(WD)" --define "_builddir $(WD)" --define "_srcrpmdir $(WD)" --define "_rpmdir $(WD)" --define "_buildrootdir $(WD)/.build" containerfs.spec
+	rpmbuild -ba --define "_sourcedir $(WD)" --define "_specdir $(WD)" --define "_builddir $(WD)" --define "_srcrpmdir $(WD)" --define "_rpmdir $(WD)" --define "_buildrootdir $(WD)/.build" fuse-overlayfs.spec
 
-srpm: dist-gzip containerfs.spec
+srpm: dist-gzip fuse-overlayfs.spec
 	echo $(VERSION)
 	$(MAKE) -C $(WD) dist-xz
-	rpmbuild -bs --define "_sourcedir $(WD)" --define "_specdir $(WD)" --define "_builddir $(WD)" --define "_srcrpmdir $(WD)" --define "_rpmdir $(WD)" --define "_buildrootdir $(WD)/.build" containerfs.spec
+	rpmbuild -bs --define "_sourcedir $(WD)" --define "_specdir $(WD)" --define "_builddir $(WD)" --define "_srcrpmdir $(WD)" --define "_rpmdir $(WD)" --define "_buildrootdir $(WD)/.build" fuse-overlayfs.spec
diff --git a/README.md b/README.md
index 457b4cb..5f39019 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-containerfs
+fuse-overlayfs
 ===========
 
 An implementation of overlay+shiftfs in FUSE for rootless containers.
@@ -13,11 +13,11 @@ Usage:
 =======================================================
 
 ```
-$ containerfs -o lowerdir=lowerdir/a:lowerdir/b,upperdir=up,workdir=workdir merged
+$ fuse-overlayfs -o lowerdir=lowerdir/a:lowerdir/b,upperdir=up,workdir=workdir merged
 ```
 
 Specify a different UID/GID mapping:
 
 ```
-$ containerfs -o uid=0:10:100:100:10000:2000,gid=0:10:100:100:10000:2000,lowerdir=lowerdir/a:lowerdir/b,upperdir=up,workdir=workdir merged
+$ fuse-overlayfs -o uid=0:10:100:100:10000:2000,gid=0:10:100:100:10000:2000,lowerdir=lowerdir/a:lowerdir/b,upperdir=up,workdir=workdir merged
 ```
diff --git a/configure.ac b/configure.ac
index 8811f8a..0391331 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.69])
-AC_INIT([containerfs], [0.1], [giuseppe@scrivano.org])
+AC_INIT([fuse-overlayfs], [0.1], [giuseppe@scrivano.org])
 AC_CONFIG_SRCDIR([main.c])
 AC_CONFIG_HEADERS([config.h])
 
diff --git a/main.c b/main.c
index 69b590d..371cb6a 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* containers: Overlay Filesystem in Userspace
+/* fuse-overlayfs: Overlay Filesystem in Userspace
 
    Copyright (C) 2018 Giuseppe Scrivano <giuseppe@scrivano.org>
    Copyright (C) 2001-2007  Miklos Szeredi <miklos@szeredi.hu>
@@ -58,7 +58,7 @@
 #define ATTR_TIMEOUT 1000000000.0
 #define ENTRY_TIMEOUT 1000000000.0
 
-#define REDIRECT_XATTR "user.containerfs.redirect"
+#define REDIRECT_XATTR "user.fuseoverlayfs.redirect"
 
 #define NODE_TO_INODE(x) ((fuse_ino_t) x)
 
diff --git a/rpm/containerfs.spec.template b/rpm/fuse-overlayfs.spec.template
similarity index 83%
rename from rpm/containerfs.spec.template
rename to rpm/fuse-overlayfs.spec.template
index 34914a0..80911f6 100644
--- a/rpm/containerfs.spec.template
+++ b/rpm/fuse-overlayfs.spec.template
@@ -1,10 +1,10 @@
 Summary: FUSE filesystem for containers.
-Name: containerfs
+Name: fuse-overlayfs
 Version: #VERSION#
 Release: 1%{?dist}
 Source0: %{url}/archive/%{name}-%{version}.tar.gz
 License: GPLv3+
-URL: https://github.com/giuseppe/containerfs
+URL: https://github.com/giuseppe/fuse-overlayfs
 
 # We always run autogen.sh
 BuildRequires: autoconf automake
@@ -17,7 +17,7 @@ BuildRequires: autoconf
 BuildRequires: fuse3-devel
 
 %description
-containerfs is a FUSE overlayfs implementation.
+fuse-overlayfs is a FUSE overlayfs implementation.
 
 %prep
 %autosetup -n %{name}-%{version}