Rename everything but the on-disk location to flatpak

93 files changed, 676 insertions, 707 deletions

diff --git a/.gitignore b/.gitignore
index 728eeac..8174be5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,33 +27,33 @@ stamp-h1
 config.h.in
 stamp-*
 gtk-doc.make
-xdg-app
-xdg-app-session-helper
+flatpak
+flatpak-session-helper
 xdg-document-portal
-xdg-app-builder
+flatpak-builder
 testdb
 doc/*.1
 *~
-profile/xdg-app.sh
-xdg-app-dbus.[ch]
-xdg-app-systemd-dbus.[ch]
-xdg-app-resources.[ch]
-xdg-dbus-proxy
-xdg-app-system-helper
+profile/flatpak.sh
+flatpak-dbus.[ch]
+flatpak-systemd-dbus.[ch]
+flatpak-resources.[ch]
+flatpak-dbus-proxy
+flatpak-system-helper
 xdg-desktop-portal
 *.service
-xdg-app.env
-xdg-app.sh
+flatpak.env
+flatpak.sh
 document-portal/xdp-dbus.[ch]
 document-portal/xdp-resources.[ch]
 .dirstamp
 test-suite*.log
-lib/xdg-app-version-macros.h
-xdg-app.pc
-lib/xdg-app-enum-types.c
-lib/xdg-app-enum-types.h
+lib/flatpak-version-macros.h
+flatpak.pc
+lib/flatpak-enum-types.c
+lib/flatpak-enum-types.h
 test-libflatpak
-XdgApp-1.0.*
+Flatpak-1.0.*
 /doc/reference/gtkdoc-check.log
 /doc/reference/gtkdoc-check.test
 /doc/reference/gtkdoc-check.trs
@@ -65,8 +65,8 @@ XdgApp-1.0.*
 /tests/test-keyring/.gpg-v21-migrated
 /tests/test-keyring/private-keys-v1.d/
 /tests/test-keyring/trustdb.gpg
-/tests/hello*.xdgapp
-/tests/platform*.xdgapp
+/tests/hello*.pak
+/tests/platform*.pak
 /tests/repo
 /tests/package_version.txt
 *.test
@@ -76,5 +76,5 @@ XdgApp-1.0.*
 po/.intltool-merge-cache
 po/Makefile.in.in
 po/POTFILES
-system-helper/org.freedesktop.XdgApp.policy
+system-helper/org.freedesktop.Flatpak.policy
 bwrap
diff --git a/Makefile.am b/Makefile.am
index 90855ae..c5da158 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,17 +31,17 @@ CLEANFILES += $(dbus_service_DATA)
 CLEANFILES += $(systemduserunit_DATA)
 EXTRA_DIST += $(service_in_files)
 
-XDG_APP_BINDIR=$(bindir)
+FLATPAK_BINDIR=$(bindir)
 
 AM_CPPFLAGS =						\
-	-DFLATPAK_BINDIR=\"$(XDG_APP_BINDIR)\"		\
+	-DFLATPAK_BINDIR=\"$(FLATPAK_BINDIR)\"		\
 	-DFLATPAK_SYSTEMDIR=\"$(localstatedir)/lib/xdg-app\"\
-	-DFLATPAK_CONFIGDIR=\"$(sysconfdir)/xdg-app\"\
+	-DFLATPAK_CONFIGDIR=\"$(sysconfdir)/flatpak\"\
 	-DFLATPAK_BASEDIR=\"$(pkgdatadir)\"		\
 	-DFLATPAK_TRIGGERDIR=\"$(pkgdatadir)/triggers\" \
 	-DSYSTEM_FONTS_DIR=\"$(SYSTEM_FONTS_DIR)\"	\
 	-DHELPER=\"$(libdir)/flatpak/bwrap\"		\
-	-DDBUSPROXY=\"$(libexecdir)/xdg-dbus-proxy\"	\
+	-DDBUSPROXY=\"$(libexecdir)/flatpak-dbus-proxy\"	\
 	-DG_LOG_DOMAIN=\"flatpak\"			\
 	-I$(srcdir)/libglnx				\
 	-I$(srcdir)/common				\
@@ -94,26 +94,26 @@ endif
 endif
 
 completiondir = $(datadir)/bash-completion/completions
-completion_DATA = completion/xdg-app
+completion_DATA = completion/flatpak
 EXTRA_DIST += $(completion_DATA)
 
 profiledir = $(sysconfdir)/profile.d
-profile_DATA = xdg-app.sh
+profile_DATA = flatpak.sh
 EXTRA_DIST += \
-	profile/xdg-app.sh.in \
+	profile/flatpak.sh.in \
 	$(NULL)
-DISTCLEANFILES += xdg-app.sh
+DISTCLEANFILES += flatpak.sh
 
-xdg-app.sh: profile/xdg-app.sh.in
+flatpak.sh: profile/flatpak.sh.in
 	$(AM_V_GEN) $(SED) -e "s|\@localstatedir\@|$(localstatedir)|" \
 		-e "s|\@sysconfdir\@|$(sysconfdir)|" $< > $@
 
 envdir = $(datadir)/gdm/env.d
-env_DATA = xdg-app.env
-EXTRA_DIST += env.d/xdg-app.env.in
-DISTCLEANFILES += xdg-app.env
+env_DATA = flatpak.env
+EXTRA_DIST += env.d/flatpak.env.in
+DISTCLEANFILES += flatpak.env
 
-xdg-app.env: env.d/xdg-app.env.in
+flatpak.env: env.d/flatpak.env.in
 	$(AM_V_GEN) $(SED) -e "s|\@localstatedir\@|$(localstatedir)|" \
 		-e "s|\@sysconfdir\@|$(sysconfdir)|" $< > $@
 
diff --git a/README.md b/README.md
index 84c2667..84d72ac 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# xdg-app
+# Flatpak
 
-xdg-app is a system for building, distributing and running sandboxed
+flatpak is a system for building, distributing and running sandboxed
 desktop applications on Linux.
 
 See https://wiki.gnome.org/Projects/SandboxedApps for more information.
diff --git a/app/Makefile.am.inc b/app/Makefile.am.inc
index 19cbd6e..fa678ce 100644
--- a/app/Makefile.am.inc
+++ b/app/Makefile.am.inc
@@ -1,8 +1,8 @@
 bin_PROGRAMS += \
-	xdg-app \
+	flatpak \
 	$(NULL)
 
-xdg_app_SOURCES = \
+flatpak_SOURCES = \
 	app/flatpak-main.c \
 	app/flatpak-builtins.h \
 	app/flatpak-builtins-add-remote.c \
@@ -30,5 +30,5 @@ xdg_app_SOURCES = \
 	$(xdp_dbus_built_sources)	\
 	$(NULL)
 
-xdg_app_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(SOUP_LIBS) $(LIBARCHIVE_LIBS) libglnx.la libflatpak-common.la
-xdg_app_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(SOUP_CFLAGS) $(LIBARCHIVE_CFLAGS)
+flatpak_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(SOUP_LIBS) $(LIBARCHIVE_LIBS) libglnx.la libflatpak-common.la
+flatpak_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(SOUP_CFLAGS) $(LIBARCHIVE_CFLAGS)
diff --git a/app/flatpak-builtins-build-bundle.c b/app/flatpak-builtins-build-bundle.c
index bdc7e9e..cc99843 100644
--- a/app/flatpak-builtins-build-bundle.c
+++ b/app/flatpak-builtins-build-bundle.c
@@ -50,7 +50,7 @@ static GOptionEntry options[] = {
   { "arch", 0, 0, G_OPTION_ARG_STRING, &opt_arch, "Arch to bundle for", "ARCH" },
   { "repo-url", 0, 0, G_OPTION_ARG_STRING, &opt_repo_url, "Url for repo", "URL" },
   { "gpg-keys", 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &opt_gpg_file, "Add GPG key from FILE (- for stdin)", "FILE" },
-  { "oci", 0, 0, G_OPTION_ARG_NONE, &opt_oci, "Export oci image instead of xdg-app bundle"},
+  { "oci", 0, 0, G_OPTION_ARG_NONE, &opt_oci, "Export oci image instead of flatpak bundle"},
 
   { NULL }
 };
@@ -132,7 +132,7 @@ build_bundle (OstreeRepo *repo, GFile *file,
    * later.  Furthermore, the use of an uint32 lets use detect
    * byteorder issues.
    */
-  g_variant_builder_add (&metadata_builder, "{sv}", "xdg-app",
+  g_variant_builder_add (&metadata_builder, "{sv}", "flatpak",
                          g_variant_new_uint32 (0xe5890001));
 
   g_variant_builder_add (&metadata_builder, "{sv}", "ref", g_variant_new_string (full_branch));
@@ -180,7 +180,7 @@ build_bundle (OstreeRepo *repo, GFile *file,
           int i;
           g_autoptr(GFile) icons_dir =
             g_file_resolve_relative_path (root,
-                                          "files/share/app-info/icons/xdg-app");
+                                          "files/share/app-info/icons/flatpak");
           const char *icon_sizes[] = { "64x64", "128x128" };
           const char *icon_sizes_key[] = { "icon-64", "icon-128" };
           g_autofree char *icon_name = g_strconcat (name, ".png", NULL);
@@ -749,7 +749,7 @@ build_oci (OstreeRepo *repo, GFile *file,
   return FALSE;
 #elif !defined(HAVE_LIBARCHIVE)
   g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-               "This version of xdg-app is not compiled with libarchive support");
+               "This version of flatpak is not compiled with libarchive support");
   return FALSE;
 #else
   struct free_write_archive archive *a = NULL;
@@ -876,7 +876,7 @@ build_oci (OstreeRepo *repo, GFile *file,
   if (archive_write_close (a) != ARCHIVE_OK)
     return propagate_libarchive_error (error, a);
 
-  g_print ("WARNING: the oci format produced by xdg-app is experimental and unstable.\n"
+  g_print ("WARNING: the oci format produced by flatpak is experimental and unstable.\n"
            "Don't use this for anything but experiments for now\n");
 
   return TRUE;
diff --git a/app/flatpak-builtins-build-import-bundle.c b/app/flatpak-builtins-build-import-bundle.c
index 5312a89..b7e0d7e 100644
--- a/app/flatpak-builtins-build-import-bundle.c
+++ b/app/flatpak-builtins-build-import-bundle.c
@@ -36,7 +36,7 @@ static gboolean opt_oci = FALSE;
 
 static GOptionEntry options[] = {
   { "ref", 0, 0, G_OPTION_ARG_STRING, &opt_ref, "Override the ref used for the imported bundle", "REF" },
-  { "oci", 0, 0, G_OPTION_ARG_NONE, &opt_oci, "Import oci image instead of xdg-app bundle"},
+  { "oci", 0, 0, G_OPTION_ARG_NONE, &opt_oci, "Import oci image instead of flatpak bundle"},
   { NULL }
 };
 
@@ -52,7 +52,7 @@ import_oci (OstreeRepo *repo, GFile *file,
   return FALSE;
 #elif !defined(HAVE_LIBARCHIVE)
   g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-               "This version of xdg-app is not compiled with libarchive support");
+               "This version of flatpak is not compiled with libarchive support");
   return FALSE;
 #else
   g_autoptr(OstreeMutableTree) archive_mtree = NULL;
diff --git a/builder/Makefile.am.inc b/builder/Makefile.am.inc
index 1f560d5..b1f7117 100644
--- a/builder/Makefile.am.inc
+++ b/builder/Makefile.am.inc
@@ -1,8 +1,8 @@
 bin_PROGRAMS += \
-	xdg-app-builder \
+	flatpak-builder \
 	$(NULL)
 
-xdg_app_builder_SOURCES = \
+flatpak_builder_SOURCES = \
 	builder/builder-main.c \
 	builder/builder-manifest.c \
 	builder/builder-manifest.h \
@@ -34,6 +34,6 @@ xdg_app_builder_SOURCES = \
 	builder/builder-utils.h \
 	$(NULL)
 
-xdg_app_builder_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(JSON_LIBS) $(SOUP_LIBS) $(LIBARCHIVE_LIBS) $(LIBELF_LIBS) \
+flatpak_builder_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(JSON_LIBS) $(SOUP_LIBS) $(LIBARCHIVE_LIBS) $(LIBELF_LIBS) \
 			libglnx.la libflatpak-common.la
-xdg_app_builder_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(JSON_CFLAGS) $(SOUP_CFLAGS) $(LIBARCHIVE_CFLAGS)
+flatpak_builder_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(JSON_CFLAGS) $(SOUP_CFLAGS) $(LIBARCHIVE_CFLAGS)
diff --git a/builder/builder-context.c b/builder/builder-context.c
index f0e127d..afc5bc9 100644
--- a/builder/builder-context.c
+++ b/builder/builder-context.c
@@ -137,7 +137,7 @@ builder_context_constructed (GObject *object)
 {
   BuilderContext *self = BUILDER_CONTEXT (object);
 
-  self->state_dir = g_file_get_child (self->base_dir, ".xdg-app-builder");
+  self->state_dir = g_file_get_child (self->base_dir, ".flatpak-builder");
   self->download_dir = g_file_get_child (self->state_dir, "downloads");
   self->build_dir = g_file_get_child (self->state_dir, "build");
   self->cache_dir = g_file_get_child (self->state_dir, "cache");
@@ -224,7 +224,7 @@ builder_context_get_soup_session (BuilderContext *self)
     {
       const char *http_proxy;
 
-      self->soup_session = soup_session_new_with_options (SOUP_SESSION_USER_AGENT, "xdg-app-builder ",
+      self->soup_session = soup_session_new_with_options (SOUP_SESSION_USER_AGENT, "flatpak-builder ",
                                                           SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE,
                                                           SOUP_SESSION_USE_THREAD_CONTEXT, TRUE,
                                                           SOUP_SESSION_TIMEOUT, 60,
@@ -391,7 +391,7 @@ builder_context_extend_env (BuilderContext *self,
       const char *old_path = g_environ_getenv (envp, "PATH");
       g_autofree char *new_path = NULL;
       if (old_path == NULL)
-        old_path = "/app/bin:/usr/bin"; /* This is the xdg-app default PATH */
+        old_path = "/app/bin:/usr/bin"; /* This is the flatpak default PATH */
 
       new_path = g_strdup_printf ("/run/ccache/bin:%s", old_path);
       envp = g_environ_setenv (envp, "PATH", new_path, TRUE);
diff --git a/builder/builder-main.c b/builder/builder-main.c
index 41c5e18..512859c 100644
--- a/builder/builder-main.c
+++ b/builder/builder-main.c
@@ -112,7 +112,7 @@ do_export (BuilderContext *build_context,
   g_autoptr(GSubprocess) subp = NULL;
 
   args = g_ptr_array_new_with_free_func (g_free);
-  g_ptr_array_add (args, g_strdup ("xdg-app"));
+  g_ptr_array_add (args, g_strdup ("flatpak"));
   g_ptr_array_add (args, g_strdup ("build-export"));
 
   g_ptr_array_add (args, g_strdup_printf ("--arch=%s", builder_context_get_arch (build_context)));
diff --git a/builder/builder-manifest.c b/builder/builder-manifest.c
index 95ae42b..986f7ef 100644
--- a/builder/builder-manifest.c
+++ b/builder/builder-manifest.c
@@ -818,7 +818,7 @@ builder_manifest_get_branch (BuilderManifest *self)
 }
 
 static char *
-xdg_app (GError **error,
+flatpak (GError **error,
          ...)
 {
   gboolean res;
@@ -826,7 +826,7 @@ xdg_app (GError **error,
   va_list ap;
 
   va_start (ap, error);
-  res = flatpak_spawn (NULL, &output, error, "xdg-app", ap);
+  res = flatpak_spawn (NULL, &output, error, "flatpak", ap);
   va_end (ap);
 
   if (res)
@@ -846,14 +846,14 @@ builder_manifest_start (BuilderManifest *self,
 
   arch_option = g_strdup_printf ("--arch=%s", builder_context_get_arch (context));
 
-  self->sdk_commit = xdg_app (NULL, "info", arch_option, "--show-commit", self->sdk,
+  self->sdk_commit = flatpak (NULL, "info", arch_option, "--show-commit", self->sdk,
                               builder_manifest_get_runtime_version (self), NULL);
   if (self->sdk_commit == NULL)
     return flatpak_fail (error, "Unable to find sdk %s version %s",
                          self->sdk,
                          builder_manifest_get_runtime_version (self));
 
-  self->runtime_commit = xdg_app (NULL, "info", arch_option, "--show-commit", self->runtime,
+  self->runtime_commit = flatpak (NULL, "info", arch_option, "--show-commit", self->runtime,
                                   builder_manifest_get_runtime_version (self), NULL);
   if (self->runtime_commit == NULL)
     return flatpak_fail (error, "Unable to find runtime %s version %s",
@@ -899,7 +899,7 @@ builder_manifest_init_app_dir (BuilderManifest *self,
 
   args = g_ptr_array_new_with_free_func (g_free);
 
-  g_ptr_array_add (args, g_strdup ("xdg-app"));
+  g_ptr_array_add (args, g_strdup ("flatpak"));
   g_ptr_array_add (args, g_strdup ("build-init"));
   if (self->writable_sdk || self->build_runtime)
     {
@@ -1129,7 +1129,7 @@ command (GFile      *app_dir,
   int i;
 
   args = g_ptr_array_new_with_free_func (g_free);
-  g_ptr_array_add (args, g_strdup ("xdg-app"));
+  g_ptr_array_add (args, g_strdup ("flatpak"));
   g_ptr_array_add (args, g_strdup ("build"));
 
   g_ptr_array_add (args, g_strdup ("--nofilesystem=host"));
@@ -1306,7 +1306,7 @@ appstream_compose (GFile   *app_dir,
   va_list ap;
 
   args = g_ptr_array_new_with_free_func (g_free);
-  g_ptr_array_add (args, g_strdup ("xdg-app"));
+  g_ptr_array_add (args, g_strdup ("flatpak"));
   g_ptr_array_add (args, g_strdup ("build"));
   g_ptr_array_add (args, g_strdup ("--nofilesystem=host"));
   g_ptr_array_add (args, g_file_get_path (app_dir));
@@ -1550,7 +1550,7 @@ builder_manifest_cleanup (BuilderManifest *self,
           g_print ("Running appstream-compose\n");
           if (!appstream_compose (app_dir, error,
                                   self->build_runtime ?  "--prefix=/usr" : "--prefix=/app",
-                                  "--origin=xdg-app",
+                                  "--origin=flatpak",
                                   basename_arg,
                                   self->id,
                                   NULL))
@@ -1605,7 +1605,7 @@ builder_manifest_finish (BuilderManifest *self,
         }
 
       args = g_ptr_array_new_with_free_func (g_free);
-      g_ptr_array_add (args, g_strdup ("xdg-app"));
+      g_ptr_array_add (args, g_strdup ("flatpak"));
       g_ptr_array_add (args, g_strdup ("build-finish"));
       if (self->command)
         g_ptr_array_add (args, g_strdup_printf ("--command=%s", self->command));
@@ -1771,7 +1771,7 @@ builder_manifest_create_platform (BuilderManifest *self,
 
       args = g_ptr_array_new_with_free_func (g_free);
 
-      g_ptr_array_add (args, g_strdup ("xdg-app"));
+      g_ptr_array_add (args, g_strdup ("flatpak"));
       g_ptr_array_add (args, g_strdup ("build-init"));
       g_ptr_array_add (args, g_strdup ("--update"));
       g_ptr_array_add (args, g_strdup ("--writable-sdk"));
@@ -1985,7 +1985,7 @@ builder_manifest_run (BuilderManifest *self,
     return FALSE;
 
   args = g_ptr_array_new_with_free_func (g_free);
-  g_ptr_array_add (args, g_strdup ("xdg-app"));
+  g_ptr_array_add (args, g_strdup ("flatpak"));
   g_ptr_array_add (args, g_strdup ("build"));
 
   build_dir_path = g_file_get_path (builder_context_get_build_dir (context));
@@ -2038,7 +2038,7 @@ builder_manifest_run (BuilderManifest *self,
 
   if (!execvp ((char *) args->pdata[0], (char **) args->pdata))
     {
-      g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), "Unable to start xdg-app build");
+      g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), "Unable to start flatpak build");
       return FALSE;
     }
 
diff --git a/builder/builder-module.c b/builder/builder-module.c
index 178b071..2ba5c37 100644
--- a/builder/builder-module.c
+++ b/builder/builder-module.c
@@ -583,7 +583,7 @@ build (GFile          *app_dir,
   int i;
 
   args = g_ptr_array_new_with_free_func (g_free);
-  g_ptr_array_add (args, g_strdup ("xdg-app"));
+  g_ptr_array_add (args, g_strdup ("flatpak"));
   g_ptr_array_add (args, g_strdup ("build"));
 
   source_dir_path_canonical = canonicalize_file_name (source_dir_path);
diff --git a/builder/builder-source-shell.c b/builder/builder-source-shell.c
index e9ebcbb..2902258 100644
--- a/builder/builder-source-shell.c
+++ b/builder/builder-source-shell.c
@@ -126,7 +126,7 @@ run_script (BuilderContext *context,
   g_autofree char *source_dir_path_canonical = NULL;
 
   args = g_ptr_array_new_with_free_func (g_free);
-  g_ptr_array_add (args, g_strdup ("xdg-app"));
+  g_ptr_array_add (args, g_strdup ("flatpak"));
   g_ptr_array_add (args, g_strdup ("build"));
 
   source_dir_path_canonical = canonicalize_file_name (source_dir_path);
diff --git a/common/Makefile.am.inc b/common/Makefile.am.inc
index a10e59e..06d676d 100644
--- a/common/Makefile.am.inc
+++ b/common/Makefile.am.inc
@@ -4,12 +4,12 @@ dbus_built_sources = common/flatpak-dbus.c common/flatpak-dbus.h
 systemd_dbus_built_sources = common/flatpak-systemd-dbus.c common/flatpak-systemd-dbus.h
 BUILT_SOURCES += $(dbus_built_sources) $(systemd_dbus_built_sources)
 
-$(dbus_built_sources) : data/org.freedesktop.XdgApp.xml
+$(dbus_built_sources) : data/org.freedesktop.Flatpak.xml
 	$(AM_V_GEN) $(GDBUS_CODEGEN)				\
-		--interface-prefix org.freedesktop.XdgApp.	\
+		--interface-prefix org.freedesktop.Flatpak.	\
 		--c-namespace Flatpak				\
 		--generate-c-code $(builddir)/common/flatpak-dbus	\
-		$(srcdir)/data/org.freedesktop.XdgApp.xml	\
+		$(srcdir)/data/org.freedesktop.Flatpak.xml	\
 		$(NULL)
 
 $(systemd_dbus_built_sources) : data/org.freedesktop.systemd1.xml
diff --git a/common/flatpak-db.c b/common/flatpak-db.c
index 429700d..f20443e 100644
--- a/common/flatpak-db.c
+++ b/common/flatpak-db.c
@@ -1,4 +1,4 @@
-/* xdg-app-db.c
+/* flatpak-db.c
  *
  * Copyright (C) 2015 Red Hat, Inc
  *
diff --git a/common/flatpak-db.h b/common/flatpak-db.h
index 738cf9b..f775785 100644
--- a/common/flatpak-db.h
+++ b/common/flatpak-db.h
@@ -1,4 +1,4 @@
-/* xdg-app-db.h
+/* flatpak-db.h
  *
  * Copyright © 2015 Red Hat, Inc
  *
diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
index 1aac10c..c4bbfe3 100644
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
@@ -37,19 +37,19 @@
 
 #include "errno.h"
 
-#define NO_SYSTEM_HELPER ((XdgAppSystemHelper *) (gpointer) 1)
+#define NO_SYSTEM_HELPER ((FlatpakSystemHelper *) (gpointer) 1)
 
 struct FlatpakDir
 {
-  GObject             parent;
+  GObject              parent;
 
-  gboolean            user;
-  GFile              *basedir;
-  OstreeRepo         *repo;
+  gboolean             user;
+  GFile               *basedir;
+  OstreeRepo          *repo;
 
-  XdgAppSystemHelper *system_helper;
+  FlatpakSystemHelper *system_helper;
 
-  SoupSession        *soup_session;
+  SoupSession         *soup_session;
 };
 
 typedef struct
@@ -75,7 +75,7 @@ typedef struct
 G_DEFINE_TYPE (FlatpakDir, flatpak_dir, G_TYPE_OBJECT)
 G_DEFINE_TYPE (FlatpakDeploy, flatpak_deploy, G_TYPE_OBJECT)
 
-G_DEFINE_QUARK (xdg - app - dir - error - quark, flatpak_dir_error)
+G_DEFINE_QUARK (flatpak-dir-error-quark, flatpak_dir_error)
 
 enum {
   PROP_0,
@@ -199,16 +199,16 @@ flatpak_ensure_user_cache_dir_location (GError **error)
   return g_steal_pointer (&cache_dir);
 }
 
-static XdgAppSystemHelper *
+static FlatpakSystemHelper *
 flatpak_dir_get_system_helper (FlatpakDir *self)
 {
   g_autoptr(GError) error = NULL;
 
   if (g_once_init_enter (&self->system_helper))
     {
-      XdgAppSystemHelper *system_helper;
+      FlatpakSystemHelper *system_helper;
       system_helper =
-        xdg_app_system_helper_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
+        flatpak_system_helper_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
                                                       G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
                                                       G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
                                                       "org.freedesktop.Flatpak.SystemHelper",
@@ -231,7 +231,7 @@ flatpak_dir_get_system_helper (FlatpakDir *self)
 gboolean
 flatpak_dir_use_child_repo (FlatpakDir *self)
 {
-  XdgAppSystemHelper *system_helper;
+  FlatpakSystemHelper *system_helper;
 
   if (self->user || getuid () == 0)
     return FALSE;
@@ -547,7 +547,7 @@ flatpak_dir_get_repo (FlatpakDir *self)
 }
 
 
-/* This is an exclusive per xdg-app installation file lock that is taken
+/* This is an exclusive per flatpak installation file lock that is taken
  * whenever any config in the directory outside the repo is to be changed. For
  * instance deployements, overrides or active commit changes.
  *
@@ -2041,7 +2041,7 @@ export_desktop_file (const char   *app,
       g_key_file_remove_key (keyfile, groups[i], "X-GNOME-Bugzilla-ExtraInfoScript", NULL);
 
       new_exec = g_string_new ("");
-      g_string_append_printf (new_exec, FLATPAK_BINDIR "/xdg-app run --branch=%s --arch=%s", escaped_branch, escaped_arch);
+      g_string_append_printf (new_exec, FLATPAK_BINDIR "/flatpak run --branch=%s --arch=%s", escaped_branch, escaped_arch);
 
       old_exec = g_key_file_get_string (keyfile, groups[i], "Exec", NULL);
       if (old_exec && g_shell_parse_argv (old_exec, &old_argc, &old_argv, NULL) && old_argc >= 1)
@@ -2868,7 +2868,7 @@ flatpak_dir_install (FlatpakDir          *self,
       g_autoptr(OstreeRepo) child_repo = NULL;
       g_auto(GLnxLockFile) child_repo_lock = GLNX_LOCK_FILE_INIT;
       char *empty_subpaths[] = {NULL};
-      XdgAppSystemHelper *system_helper;
+      FlatpakSystemHelper *system_helper;
 
       if (no_pull)
         return flatpak_fail (error, "No-pull install not supported without root permissions");
@@ -2889,7 +2889,7 @@ flatpak_dir_install (FlatpakDir          *self,
                              progress, cancellable, error))
         return FALSE;
 
-      if (!xdg_app_system_helper_call_deploy_sync (system_helper,
+      if (!flatpak_system_helper_call_deploy_sync (system_helper,
                                                    gs_file_get_path_cached (ostree_repo_get_path (child_repo)),
                                                    FLATPAK_HELPER_DEPLOY_FLAGS_NONE,
                                                    ref,
@@ -2943,7 +2943,7 @@ flatpak_dir_update (FlatpakDir          *self,
       char *empty_subpaths[] = {NULL};
       g_autofree char *pulled_checksum = NULL;
       g_autofree char *active_checksum = NULL;
-      XdgAppSystemHelper *system_helper;
+      FlatpakSystemHelper *system_helper;
 
       if (no_pull)
         return flatpak_fail (error, "No-pull update not supported without root permissions");
@@ -2974,7 +2974,7 @@ flatpak_dir_update (FlatpakDir          *self,
       if (g_strcmp0 (active_checksum, pulled_checksum) != 0)
         {
 
-          if (!xdg_app_system_helper_call_deploy_sync (system_helper,
+          if (!flatpak_system_helper_call_deploy_sync (system_helper,
                                                        gs_file_get_path_cached (ostree_repo_get_path (child_repo)),
                                                        FLATPAK_HELPER_DEPLOY_FLAGS_UPDATE,
                                                        ref,
diff --git a/common/flatpak-portal-error.c b/common/flatpak-portal-error.c
index 7672f0f..0d18343 100644
--- a/common/flatpak-portal-error.c
+++ b/common/flatpak-portal-error.c
@@ -1,4 +1,4 @@
-/* xdg-app-error.c
+/* flatpak-error.c
  *
  * Copyright (C) 2015 Red Hat, Inc
  *
@@ -40,7 +40,7 @@ flatpak_portal_error_quark (void)
 {
   static volatile gsize quark_volatile = 0;
 
-  g_dbus_error_register_error_domain ("xdg-app-portal-error-quark",
+  g_dbus_error_register_error_domain ("flatpak-portal-error-quark",
                                       &quark_volatile,
                                       flatpak_error_entries,
                                       G_N_ELEMENTS (flatpak_error_entries));
diff --git a/common/flatpak-portal-error.h b/common/flatpak-portal-error.h
index 2ff02e8..14afad9 100644
--- a/common/flatpak-portal-error.h
+++ b/common/flatpak-portal-error.h
@@ -1,4 +1,4 @@
-/* xdg-app-error.c
+/* flatpak-portal-error.c
  *
  * Copyright (C) 2015 Red Hat, Inc
  *
diff --git a/common/flatpak-run.c b/common/flatpak-run.c
index ff4eb37..388aef9 100644
--- a/common/flatpak-run.c
+++ b/common/flatpak-run.c
@@ -1318,7 +1318,7 @@ flatpak_run_add_x11_args (GPtrArray *argv_array,
 
 #ifdef ENABLE_XAUTH
       int fd;
-      fd = g_file_open_tmp ("xdg-app-xauth-XXXXXX", &tmp_path, NULL);
+      fd = g_file_open_tmp ("flatpak-xauth-XXXXXX", &tmp_path, NULL);
       if (fd >= 0)
         {
           FILE *output = fdopen (fd, "wb");
@@ -1795,7 +1795,7 @@ flatpak_run_add_environment_args (GPtrArray      *argv_array,
       g_autofree char *path = NULL;
       int fd;
 
-      fd = g_file_open_tmp ("xdg-app-user-dir-XXXXXX.dirs", &tmp_path, NULL);
+      fd = g_file_open_tmp ("flatpak-user-dir-XXXXXX.dirs", &tmp_path, NULL);
       if (fd >= 0)
         {
           close (fd);
@@ -2087,7 +2087,7 @@ flatpak_run_in_transient_unit (const char *appid, GError **error)
   if (!manager)
     goto out;
 
-  name = g_strdup_printf ("xdg-app-%s-%d.scope", appid, getpid ());
+  name = g_strdup_printf ("flatpak-%s-%d.scope", appid, getpid ());
 
   g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(sv)"));
 
@@ -2202,14 +2202,14 @@ add_app_info_args (GPtrArray      *argv_array,
   g_autofree char *tmp_path = NULL;
   int fd;
 
-  fd = g_file_open_tmp ("xdg-app-context-XXXXXX", &tmp_path, NULL);
+  fd = g_file_open_tmp ("flatpak-context-XXXXXX", &tmp_path, NULL);
   if (fd >= 0)
     {
       g_autoptr(GKeyFile) keyfile = NULL;
       g_autoptr(GFile) files = NULL;
       g_autofree char *files_path = NULL;
       g_autofree char *fd_str = NULL;
-      g_autofree char *dest = g_strdup_printf ("/run/user/%d/xdg-app-info", getuid ());
+      g_autofree char *dest = g_strdup_printf ("/run/user/%d/flatpak-info", getuid ());
 
       close (fd);
 
@@ -2247,17 +2247,17 @@ static void
 add_monitor_path_args (GPtrArray *argv_array,
                        char    ***envp_p)
 {
-  g_autoptr(AutoXdgAppSessionHelper) session_helper = NULL;
+  g_autoptr(AutoFlatpakSessionHelper) session_helper = NULL;
   g_autofree char *monitor_path = NULL;
 
   session_helper =
-    xdg_app_session_helper_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+    flatpak_session_helper_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
                                                    G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
                                                    "org.freedesktop.Flatpak",
                                                    "/org/freedesktop/Flatpak/SessionHelper",
                                                    NULL, NULL);
   if (session_helper &&
-      xdg_app_session_helper_call_request_monitor_sync (session_helper,
+      flatpak_session_helper_call_request_monitor_sync (session_helper,
                                                         &monitor_path,
                                                         NULL, NULL))
     {
@@ -2545,7 +2545,7 @@ setup_seccomp (GPtrArray  *argv_array,
           /* This *adds* the target arch, instead of replacing the
              native one. This is not ideal, because we'd like to only
              allow the target arch, but we can't really disallow the
-             native arch at this point, because then xdg-app-helper
+             native arch at this point, because then bubblewrap
              couldn't continue runnning. */
           r = seccomp_arch_add (seccomp, arch_id);
           if (r < 0 && r != -EEXIST)
@@ -2612,7 +2612,7 @@ setup_seccomp (GPtrArray  *argv_array,
         r = seccomp_rule_add_exact (seccomp, SCMP_ACT_ERRNO (EAFNOSUPPORT), SCMP_SYS (socket), 1, SCMP_A0 (SCMP_CMP_EQ, family));
     }
 
-  fd = g_file_open_tmp ("xdg-app-seccomp-XXXXXX", &path, error);
+  fd = g_file_open_tmp ("flatpak-seccomp-XXXXXX", &path, error);
   if (fd == -1)
     return FALSE;
 
@@ -2969,7 +2969,7 @@ flatpak_run_app (const char     *app_ref,
     close (sync_fds[1]);
 
   add_args (argv_array,
-            /* Not in base, because we don't want this for xdg-app build */
+            /* Not in base, because we don't want this for flatpak build */
             "--symlink", "/app/lib/debug/source", "/run/build",
             "--symlink", "/usr/lib/debug/source", "/run/build-runtime",
             NULL);
diff --git a/common/flatpak-utils.c b/common/flatpak-utils.c
index dbe2f99..fca297a 100644
--- a/common/flatpak-utils.c
+++ b/common/flatpak-utils.c
@@ -1023,10 +1023,10 @@ got_credentials_cb (GObject      *source_object,
                   const char *unit = lines[i] + strlen ("1:name=systemd:");
                   g_autofree char *scope = g_path_get_basename (unit);
 
-                  if (g_str_has_prefix (scope, "xdg-app-") &&
+                  if (g_str_has_prefix (scope, "flatpak-") &&
                       g_str_has_suffix (scope, ".scope"))
                     {
-                      const char *name = scope + strlen ("xdg-app-");
+                      const char *name = scope + strlen ("flatpak-");
                       char *dash = strchr (name, '-');
                       if (dash != NULL)
                         {
@@ -1532,9 +1532,9 @@ flatpak_repo_set_title (OstreeRepo *repo,
   config = ostree_repo_copy_config (repo);
 
   if (title)
-    g_key_file_set_string (config, "xdg-app", "title", title);
+    g_key_file_set_string (config, "flatpak", "title", title);
   else
-    g_key_file_remove_key (config, "xdg-app", "title", NULL);
+    g_key_file_remove_key (config, "flatpak", "title", NULL);
 
   if (!ostree_repo_write_config (repo, config, error))
     return FALSE;
@@ -1633,7 +1633,7 @@ flatpak_repo_update (OstreeRepo   *repo,
   config = ostree_repo_get_config (repo);
 
   if (config)
-    title = g_key_file_get_string (config, "xdg-app", "title", NULL);
+    title = g_key_file_get_string (config, "flatpak", "title", NULL);
 
   if (title)
     g_variant_builder_add (&builder, "{sv}", "xa.title",
@@ -1779,7 +1779,7 @@ validate_component (FlatpakXml *component,
   bundle->attribute_names = g_new0 (char *, 2 * 4);
   bundle->attribute_values = g_new0 (char *, 2 * 4);
   bundle->attribute_names[0] = g_strdup ("type");
-  bundle->attribute_values[0] = g_strdup ("xdg-app");
+  bundle->attribute_values[0] = g_strdup ("flatpak");
 
   i = 1;
   if (runtime)
@@ -1905,7 +1905,7 @@ copy_icon (const char *id,
 
   g_autoptr(GFile) icons_dir =
     g_file_resolve_relative_path (root,
-                                  "files/share/app-info/icons/xdg-app");
+                                  "files/share/app-info/icons/flatpak");
   g_autoptr(GFile) size_dir = g_file_get_child (icons_dir, size);
   g_autoptr(GFile) icon_file = g_file_get_child (size_dir, icon_name);
   g_autoptr(GFile) dest_dir = g_file_get_child (dest, "icons");
@@ -2049,7 +2049,7 @@ flatpak_appstream_xml_new (void)
   appstream_components->attribute_names[0] = g_strdup ("version");
   appstream_components->attribute_values[0] = g_strdup ("0.8");
   appstream_components->attribute_names[1] = g_strdup ("origin");
-  appstream_components->attribute_values[1] = g_strdup ("xdg-app");
+  appstream_components->attribute_values[1] = g_strdup ("flatpak");
 
   return appstream_root;
 }
@@ -2124,7 +2124,7 @@ flatpak_repo_generate_appstream (OstreeRepo   *repo,
     {
       GHashTableIter iter2;
       const char *arch = key;
-      g_autofree char *tmpdir = g_strdup ("/tmp/xdg-app-appstream-XXXXXX");
+      g_autofree char *tmpdir = g_strdup ("/tmp/flatpak-appstream-XXXXXX");
       g_autoptr(FlatpakTempDir) tmpdir_file = NULL;
       g_autoptr(GFile) appstream_file = NULL;
       g_autoptr(GFile) root = NULL;
diff --git a/common/flatpak-utils.h b/common/flatpak-utils.h
index 7187015..8f3ab92 100644
--- a/common/flatpak-utils.h
+++ b/common/flatpak-utils.h
@@ -292,8 +292,8 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (SoupURI, soup_uri_free)
 /* This uses a weird Auto prefix to avoid conflicts with later added autogenerated autoptr support, per:
  * https://git.gnome.org/browse/glib/commit/?id=1c6cd5f0a3104aa9b62c7f1d3086181f63e71b59
  */
-typedef XdgAppSessionHelper AutoXdgAppSessionHelper;
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (AutoXdgAppSessionHelper, g_object_unref)
+typedef FlatpakSessionHelper AutoFlatpakSessionHelper;
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (AutoFlatpakSessionHelper, g_object_unref)
 
 typedef struct FlatpakXml FlatpakXml;
 
diff --git a/completion/xdg-app b/completion/flatpak
index b59d8f0..42fbaaf 100755
--- a/completion/xdg-app
+++ b/completion/flatpak
@@ -7,7 +7,7 @@ __contains_word () {
         done
 }
 
-_xdg-app() {
+_flatpak() {
         local cur prev
         local cur=${COMP_WORDS[COMP_CWORD]}
         local prev=${COMP_WORDS[COMP_CWORD-1]}
@@ -122,13 +122,13 @@ _xdg-app() {
                                 comps=$(compgen -A command)
                                 ;;
                         --var)
-                                comps=$(xdg-app $mode list --runtime)
+                                comps=$(flatpak $mode list --runtime)
                                 ;;
                         --runtime)
                                 if __contains_word "$verb" ${VERBS[KIND]}; then
                                     comps=XXX
                                 else
-                                    comps=$(xdg-app $mode list --runtime)
+                                    comps=$(flatpak $mode list --runtime)
                                 fi
                                 ;;
                         --share|--noshare)
@@ -287,7 +287,7 @@ _xdg-app() {
         else
                 case "$verb" in
                 remote-add|remote-modify|remote-delete|remote-ls)
-                        comps=$(xdg-app $mode remote-list)
+                        comps=$(flatpak $mode remote-list)
                 ;;
 
                 install)
@@ -296,12 +296,12 @@ _xdg-app() {
                                 compopt -o filenames
                         else
                             if [[ -z $remote ]]; then
-                                comps=$(xdg-app $mode remote-list)
+                                comps=$(flatpak $mode remote-list)
                                 if [[ $mode == "--system" ]]; then
                                     comps="$comps --user"
                                 fi
                             elif [[ -z $name ]]; then
-                                comps=$(xdg-app remote-ls $mode  $kind $remote)
+                                comps=$(flatpak remote-ls $mode  $kind $remote)
                             else
                                 comps='' # FIXME: branches
                             fi
@@ -314,7 +314,7 @@ _xdg-app() {
 
                 update|uninstall)
                         if [[ -z $name ]]; then
-                                comps=$(xdg-app $mode $kind list)
+                                comps=$(flatpak $mode $kind list)
                         else
                                 comps='' # FIXME: branches
                         fi
@@ -323,7 +323,7 @@ _xdg-app() {
                 run|override)
                         # run doesn't take --user or --system, so don't use mode here
                         if [[ -z $name ]]; then
-                                comps=$(xdg-app list --app)
+                                comps=$(flatpak list --app)
                         fi
                         ;;
 
@@ -333,9 +333,9 @@ _xdg-app() {
                                 comps=''
                                 compopt -o dirnames
                         elif [[ -z $sdk ]]; then
-                                comps="$(xdg-app list --runtime) $(xdg-app --user list --runtime)"
+                                comps="$(flatpak list --runtime) $(flatpak --user list --runtime)"
                         elif [[ -z $name ]]; then
-                                comps="$(xdg-app list --runtime) $(xdg-app --user list --runtime)"
+                                comps="$(flatpak list --runtime) $(flatpak --user list --runtime)"
                         else
                                 comps='' # FIXME: branches
                         fi
@@ -402,4 +402,4 @@ _xdg-app() {
         return 0
 }
 
-complete -F _xdg-app xdg-app
+complete -F _flatpak flatpak
diff --git a/data/Makefile.am.inc b/data/Makefile.am.inc
index a47819b..bf11ca4 100644
--- a/data/Makefile.am.inc
+++ b/data/Makefile.am.inc
@@ -1,11 +1,11 @@
 introspectiondir = $(datadir)/dbus-1/interfaces
 introspection_DATA = \
 	data/org.freedesktop.portal.Documents.xml \
-	data/org.freedesktop.XdgApp.xml \
+	data/org.freedesktop.Flatpak.xml \
 	$(NULL)
 
 EXTRA_DIST += \
 	data/org.freedesktop.portal.Documents.xml \
 	data/org.freedesktop.systemd1.xml \
-	data/org.freedesktop.XdgApp.xml \
+	data/org.freedesktop.Flatpak.xml \
 	$(NULL)
diff --git a/data/org.freedesktop.XdgApp.xml b/data/org.freedesktop.Flatpak.xml
index d90a6e0..e9726c5 100644
--- a/data/org.freedesktop.XdgApp.xml
+++ b/data/org.freedesktop.Flatpak.xml
@@ -24,14 +24,14 @@
 -->
 
 <node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
-  <interface name='org.freedesktop.XdgApp.SessionHelper'>
+  <interface name='org.freedesktop.Flatpak.SessionHelper'>
 
     <method name="RequestMonitor">
       <arg type='ay' name='path' direction='out'/>
     </method>
   </interface>
 
-  <interface name='org.freedesktop.XdgApp.PermissionStore'>
+  <interface name='org.freedesktop.Flatpak.PermissionStore'>
 
     <method name="Lookup">
       <arg name='table' type='s' direction='in'/>
@@ -82,7 +82,7 @@
     </signal>
   </interface>
 
-  <interface name='org.freedesktop.XdgApp.SystemHelper'>
+  <interface name='org.freedesktop.Flatpak.SystemHelper'>
     <method name="Deploy">
       <arg type='ay' name='repo_path' direction='in'/>
       <arg type='u' name='flags' direction='in'/>
diff --git a/dbus-proxy/Makefile.am.inc b/dbus-proxy/Makefile.am.inc
index 6cf4947..a62c48f 100644
--- a/dbus-proxy/Makefile.am.inc
+++ b/dbus-proxy/Makefile.am.inc
@@ -1,12 +1,12 @@
 libexec_PROGRAMS += \
-	xdg-dbus-proxy \
+	flatpak-dbus-proxy \
 	$(NULL)
 
-xdg_dbus_proxy_SOURCES = \
+flatpak_dbus_proxy_SOURCES = \
 	dbus-proxy/flatpak-proxy.c	\
 	dbus-proxy/flatpak-proxy.h	\
-	dbus-proxy/dbus-proxy.c	        \
+	dbus-proxy/dbus-proxy.c		\
 	$(NULL)
 
-xdg_dbus_proxy_LDADD = $(BASE_LIBS) libglnx.la
-xdg_dbus_proxy_CFLAGS = $(BASE_CFLAGS) -I$(srcdir)/dbus-proxy
+flatpak_dbus_proxy_LDADD = $(BASE_LIBS) libglnx.la
+flatpak_dbus_proxy_CFLAGS = $(BASE_CFLAGS) -I$(srcdir)/dbus-proxy
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6d70e23..6d6f8c2 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -15,31 +15,31 @@ XSLTPROC_FLAGS = \
 	$(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
 man_MANS = \
-	xdg-app.1			\
-	xdg-app-remote-add.1		\
-	xdg-app-remote-delete.1		\
-	xdg-app-remote-list.1		\
-	xdg-app-remote-modify.1		\
-	xdg-app-remote-ls.1		\
-	xdg-app-install.1		\
-	xdg-app-update.1		\
-	xdg-app-uninstall.1		\
-	xdg-app-list.1			\
-	xdg-app-info.1			\
-	xdg-app-make-current.1		\
-	xdg-app-run.1			\
-	xdg-app-override.1		\
-	xdg-app-enter.1			\
-	xdg-app-export-file.1		\
-	xdg-app-build-init.1		\
-	xdg-app-build.1			\
-	xdg-app-build-bundle.1		\
-	xdg-app-build-import-bundle.1	\
-	xdg-app-build-finish.1		\
-	xdg-app-build-export.1		\
-	xdg-app-build-update-repo.1	\
-	xdg-app-build-sign.1		\
-	xdg-app-builder.1		\
+	flatpak.1			\
+	flatpak-remote-add.1		\
+	flatpak-remote-delete.1		\
+	flatpak-remote-list.1		\
+	flatpak-remote-modify.1		\
+	flatpak-remote-ls.1		\
+	flatpak-install.1		\
+	flatpak-update.1		\
+	flatpak-uninstall.1		\
+	flatpak-list.1			\
+	flatpak-info.1			\
+	flatpak-make-current.1		\
+	flatpak-run.1			\
+	flatpak-override.1		\
+	flatpak-enter.1			\
+	flatpak-export-file.1		\
+	flatpak-build-init.1		\
+	flatpak-build.1			\
+	flatpak-build-bundle.1		\
+	flatpak-build-import-bundle.1	\
+	flatpak-build-finish.1		\
+	flatpak-build-export.1		\
+	flatpak-build-update-repo.1	\
+	flatpak-build-sign.1		\
+	flatpak-builder.1		\
 	$(NULL)
 
 xml_files = $(man_MANS:.1=.xml)
diff --git a/doc/xdg-app-build-bundle.xml b/doc/flatpak-build-bundle.xml
index bac719f..248356d 100644
--- a/doc/xdg-app-build-bundle.xml
+++ b/doc/flatpak-build-bundle.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="xdg-app-build-bundle">
+<refentry id="flatpak-build-bundle">
 
     <refentryinfo>
-        <title>xdg-app build-bundle</title>
-        <productname>xdg-app</productname>
+        <title>flatpak build-bundle</title>
+        <productname>flatpak</productname>
 
         <authorgroup>
             <author>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app build-bundle</refentrytitle>
+        <refentrytitle>flatpak build-bundle</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-build-bundle</refname>
+        <refname>flatpak-build-bundle</refname>
         <refpurpose>Create a single file bundle from a local repository</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app build-bundle</command>
+                <command>flatpak build-bundle</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="plain">LOCATION</arg>
                 <arg choice="plain">FILENAME</arg>
@@ -51,7 +51,7 @@
         </para>
         <para>
             The format of the bundle file is that of an ostree static delta
-            (against an empty base) with some xdg-app specific metadata for
+            (against an empty base) with some flatpak specific metadata for
             the application icons and appdata.
         </para>
     </refsect1>
@@ -138,12 +138,12 @@
 
         <para>
             <citerefentry><refentrytitle>ostree</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-build-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-build</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-build-finish</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-build-import-bundle</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-repo-update</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-build-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-build</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-build-finish</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-build-import-bundle</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-repo-update</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         </para>
 
     </refsect1>
diff --git a/doc/xdg-app-build-export.xml b/doc/flatpak-build-export.xml
index 5b32a31..7aa80db 100644
--- a/doc/xdg-app-build-export.xml
+++ b/doc/flatpak-build-export.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="xdg-app-build-export">
+<refentry id="flatpak-build-export">
 
     <refentryinfo>
-        <title>xdg-app build-export</title>
-        <productname>xdg-app</productname>
+        <title>flatpak build-export</title>
+        <productname>flatpak</productname>
 
         <authorgroup>
             <author>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app build-export</refentrytitle>
+        <refentrytitle>flatpak build-export</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-build-export</refname>
+        <refname>flatpak-build-export</refname>
         <refpurpose>Create a repository from a build directory</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app build-export</command>
+                <command>flatpak build-export</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="plain">LOCATION</arg>
                 <arg choice="plain">DIRECTORY</arg>
@@ -201,7 +201,7 @@
         <title>Examples</title>
 
         <para>
-            <command>$ xdg-app build-export ~/repos/gnome-calculator/ ~/build/gnome-calculator/ org.gnome.Calculator</command>
+            <command>$ flatpak build-export ~/repos/gnome-calculator/ ~/build/gnome-calculator/ org.gnome.Calculator</command>
         </para>
 <programlisting>
 Commit: 9d0044ea480297114d03aec85c3d7ae3779438f9d2cb69d717fb54237acacb8c
@@ -219,12 +219,12 @@ Content Bytes Written: 305
 
         <para>
             <citerefentry><refentrytitle>ostree</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-build-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-build</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-build-finish</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-            <citerefentry><refentrytitle>xdg-app-build-sign</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-            <citerefentry><refentrytitle>xdg-app-repo-update</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-build-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-build</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-build-finish</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>flatpak-build-sign</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>flatpak-repo-update</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         </para>
 
     </refsect1>
diff --git a/doc/xdg-app-build-finish.xml b/doc/flatpak-build-finish.xml
index 6d74761..7581c47 100644
--- a/doc/xdg-app-build-finish.xml
+++ b/doc/flatpak-build-finish.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="xdg-app-build-finish">
+<refentry id="flatpak-build-finish">
 
     <refentryinfo>
-        <title>xdg-app build-finish</title>
-        <productname>xdg-app</productname>
+        <title>flatpak build-finish</title>
+        <productname>flatpak</productname>
 
         <authorgroup>
             <author>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app build-finish</refentrytitle>
+        <refentrytitle>flatpak build-finish</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-build-finish</refname>
+        <refname>flatpak-build-finish</refname>
         <refpurpose>Finalize a build directory</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app build-finish</command>
+                <command>flatpak build-finish</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="plain">DIRECTORY</arg>
             </cmdsynopsis>
@@ -265,7 +265,7 @@
         <title>Examples</title>
 
         <para>
-            <command>$ xdg-app build-finish /build/my-app --socket=x11 --share=ipc</command>
+            <command>$ flatpak build-finish /build/my-app --socket=x11 --share=ipc</command>
         </para>
 <programlisting>
 Exporting share/applications/gnome-calculator.desktop
@@ -281,10 +281,10 @@ Please review the exported files and the metadata
         <title>See also</title>
 
         <para>
-            <citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-build-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-build</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-build-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-build</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         </para>
 
     </refsect1>
diff --git a/doc/xdg-app-build-import-bundle.xml b/doc/flatpak-build-import-bundle.xml
index 6634ab6..02a8afe 100644
--- a/doc/xdg-app-build-import-bundle.xml
+++ b/doc/flatpak-build-import-bundle.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="xdg-app-build-import-bundle">
+<refentry id="flatpak-build-import-bundle">
 
     <refentryinfo>
-        <title>xdg-app build-import-bundle</title>
-        <productname>xdg-app</productname>
+        <title>flatpak build-import-bundle</title>
+        <productname>flatpak</productname>
 
         <authorgroup>
             <author>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app build-import-bundle</refentrytitle>
+        <refentrytitle>flatpak build-import-bundle</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-build-import-bundle</refname>
+        <refname>flatpak-build-import-bundle</refname>
         <refpurpose>Import a file bundle into a local repository</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app build-import-bundle</command>
+                <command>flatpak build-import-bundle</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="plain">LOCATION</arg>
                 <arg choice="plain">FILENAME</arg>
@@ -96,9 +96,9 @@
 
         <para>
             <citerefentry><refentrytitle>ostree</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-build-bundle</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-repo-update</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-build-bundle</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-repo-update</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         </para>
 
     </refsect1>
diff --git a/doc/xdg-app-build-init.xml b/doc/flatpak-build-init.xml
index 63035e8..cbd43fa 100644
--- a/doc/xdg-app-build-init.xml
+++ b/doc/flatpak-build-init.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="xdg-app-build-init">
+<refentry id="flatpak-build-init">
 
     <refentryinfo>
-        <title>xdg-app build-init</title>
-        <productname>xdg-app</productname>
+        <title>flatpak build-init</title>
+        <productname>flatpak</productname>
 
         <authorgroup>
             <author>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app build-init</refentrytitle>
+        <refentrytitle>flatpak build-init</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-build-init</refname>
+        <refname>flatpak-build-init</refname>
         <refpurpose>Initialize a build directory</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app build-init</command>
+                <command>flatpak build-init</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="plain">DIRECTORY</arg>
                 <arg choice="plain">APPNAME</arg>
@@ -101,7 +101,7 @@
                 <term><option>--writable-sdk</option></term>
 
                 <listitem><para>
-                    Initialize /usr with a copy of the sdk, which is writable during xdg-app build. This can be used
+                    Initialize /usr with a copy of the sdk, which is writable during flatpak build. This can be used
                     if you need to install build tools in /usr during the build. This is stored in the
                     <filename>usr</filename> subdirectory of the app dir, but will not be part of the final
                     app.
@@ -162,7 +162,7 @@
         <title>Examples</title>
 
         <para>
-            <command>$ xdg-app build-init /build/my-app org.gnome.Sdk org.gnome.Platform 3.16</command>
+            <command>$ flatpak build-init /build/my-app org.gnome.Sdk org.gnome.Platform 3.16</command>
         </para>
 
     </refsect1>
@@ -171,10 +171,10 @@
         <title>See also</title>
 
         <para>
-            <citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-build</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-build-finish</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-build</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-build-finish</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         </para>
 
     </refsect1>
diff --git a/doc/xdg-app-build-sign.xml b/doc/flatpak-build-sign.xml
index 4a6a5e3..ad8da8f 100644
--- a/doc/xdg-app-build-sign.xml
+++ b/doc/flatpak-build-sign.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="xdg-app-build-export">
+<refentry id="flatpak-build-export">
 
     <refentryinfo>
-        <title>xdg-app build-sign</title>
-        <productname>xdg-app</productname>
+        <title>flatpak build-sign</title>
+        <productname>flatpak</productname>
 
         <authorgroup>
             <author>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app build-sign</refentrytitle>
+        <refentrytitle>flatpak build-sign</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-build-sign</refname>
+        <refname>flatpak-build-sign</refname>
         <refpurpose>Sign an application or runtime</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app build-sign</command>
+                <command>flatpak build-sign</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="plain">LOCATION</arg>
                 <arg choice="plain">ID</arg>
@@ -126,7 +126,7 @@
         <title>Examples</title>
 
         <para>
-            <command>$ xdg-app build-export ~/repos/gnome-calculator/ ~/build/gnome-calculator/ org.gnome.Calculator</command>
+            <command>$ flatpak build-export ~/repos/gnome-calculator/ ~/build/gnome-calculator/ org.gnome.Calculator</command>
         </para>
 <programlisting>
 Commit: 9d0044ea480297114d03aec85c3d7ae3779438f9d2cb69d717fb54237acacb8c
@@ -144,9 +144,9 @@ Content Bytes Written: 305
 
         <para>
             <citerefentry><refentrytitle>ostree</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-build</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-build</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
         </para>
 
     </refsect1>
diff --git a/doc/xdg-app-build-update-repo.xml b/doc/flatpak-build-update-repo.xml
index 09dd475..1de2eff 100644
--- a/doc/xdg-app-build-update-repo.xml
+++ b/doc/flatpak-build-update-repo.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="xdg-app-build-update-repo">
+<refentry id="flatpak-build-update-repo">
 
     <refentryinfo>
-        <title>xdg-app build-update-repo</title>
-        <productname>xdg-app</productname>
+        <title>flatpak build-update-repo</title>
+        <productname>flatpak</productname>
 
         <authorgroup>
             <author>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app build-update-repo</refentrytitle>
+        <refentrytitle>flatpak build-update-repo</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-build-update-repo</refname>
+        <refname>flatpak-build-update-repo</refname>
         <refpurpose>Create a repository from a build directory</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app build-update-repo</command>
+                <command>flatpak build-update-repo</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="plain">LOCATION</arg>
             </cmdsynopsis>
@@ -43,12 +43,12 @@
             Updates repository metadata for the repository at
             <arg choice="plain">LOCATION</arg>. This command generates
             an OSTree summary file that lists the contents of the repository.
-            The summary is used by xdg-app repo-contents and other commands
+            The summary is used by flatpak repo-contents and other commands
             to display the contents of remote repositories.
         </para>
         <para>
             After this command, <arg choice="plain">LOCATION</arg> can be
-            used as the repository location for xdg-app add-repo, either by
+            used as the repository location for flatpak add-repo, either by
             exporting it over http, or directly with a file: url.
         </para>
     </refsect1>
@@ -142,9 +142,9 @@
 
         <para>
             <citerefentry><refentrytitle>ostree</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-repo-contents</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-repo-contents</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         </para>
 
     </refsect1>
diff --git a/doc/xdg-app-build.xml b/doc/flatpak-build.xml
index cb95c7a..e6abfce 100644
--- a/doc/xdg-app-build.xml
+++ b/doc/flatpak-build.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="xdg-app-build">
+<refentry id="flatpak-build">
 
     <refentryinfo>
-        <title>xdg-app build</title>
-        <productname>xdg-app</productname>
+        <title>flatpak build</title>
+        <productname>flatpak</productname>
 
         <authorgroup>
             <author>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app build</refentrytitle>
+        <refentrytitle>flatpak build</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-build</refname>
+        <refname>flatpak-build</refname>
         <refpurpose>Build in a directory</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app build</command>
+                <command>flatpak build</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="plain">DIRECTORY</arg>
                 <arg choice="opt">COMMAND <arg choice="opt" rep="repeat">ARG</arg></arg>
@@ -42,7 +42,7 @@
 
         <para>
             Runs a build command in a directory. <arg choice="plain">DIRECTORY</arg>
-            must have been initialized with <command>xdg-app build-init</command>.
+            must have been initialized with <command>flatpak build-init</command>.
         </para>
         <para>
             The sdk that is specfied in the <filename>metadata</filename> file
@@ -222,7 +222,7 @@
         <title>Examples</title>
 
         <para>
-            <command>$ xdg-app build /build/my-app rpmbuild my-app.src.rpm</command>
+            <command>$ flatpak build /build/my-app rpmbuild my-app.src.rpm</command>
         </para>
 
     </refsect1>
@@ -231,10 +231,10 @@
         <title>See also</title>
 
         <para>
-            <citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-build-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-build-finish</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-build-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-build-finish</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         </para>
 
     </refsect1>
diff --git a/doc/xdg-app-builder.xml b/doc/flatpak-builder.xml
index 4e1d64d..592e514 100644
--- a/doc/xdg-app-builder.xml
+++ b/doc/flatpak-builder.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="xdg-app-builder">
+<refentry id="flatpak-builder">
 
     <refentryinfo>
-        <title>xdg-app builder</title>
-        <productname>xdg-app</productname>
+        <title>flatpak builder</title>
+        <productname>flatpak</productname>
 
         <authorgroup>
             <author>
@@ -19,24 +19,24 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app-builder</refentrytitle>
+        <refentrytitle>flatpak-builder</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-builder</refname>
+        <refname>flatpak-builder</refname>
         <refpurpose>Help build application dependencies</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app-builder</command>
+                <command>flatpak-builder</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="plain">DIRECTORY</arg>
                 <arg choice="plain">MANIFEST</arg>
             </cmdsynopsis>
             <cmdsynopsis>
-                <command>xdg-app-builder</command>
+                <command>flatpak-builder</command>
                 <arg choice="plain">--run</arg>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="plain">DIRECTORY</arg>
@@ -49,46 +49,46 @@
         <title>Description</title>
 
         <para>
-            <command>xdg-app-builder</command> is a wrapper around the <command>xdg-app build</command> command
+            <command>flatpak-builder</command> is a wrapper around the <command>flatpak build</command> command
             that automates the building of applications and their dependencies. It is one option you can use
             to build applications.
         </para>
         <para>
-            The goal of <command>xdg-app-builder</command> is to push as much knowledge about how to build modules to
+            The goal of <command>flatpak-builder</command> is to push as much knowledge about how to build modules to
             the individual upstream projects. It does this by assuming that the modules adhere to the Build API specified
             at https://github.com/cgwalters/build-api. This essentially  means that it follows the <command>./configure
             &amp;&amp; make &amp;&amp; make install</command> scheme with an optional autogen script. If the upstream
             does not adhere to the API you can make it do so by adding patches and extra files.
         </para>
         <para>
-            An invocation of <command>xdg-app-builder</command> proceeds in these stages, each being specified
+            An invocation of <command>flatpak-builder</command> proceeds in these stages, each being specified
             in detail in json format in <arg choice="plain">MANIFEST</arg>:
             <itemizedlist mark='bullet'>
                 <listitem>
                     <para>Download all sources</para>
                 </listitem>
                 <listitem>
-                    <para>Initialize the application directory with <command>xdg-app build-init</command></para>
+                    <para>Initialize the application directory with <command>flatpak build-init</command></para>
                 </listitem>
                 <listitem>
-                    <para>Build and install each module with <command>xdg-app build</command></para>
+                    <para>Build and install each module with <command>flatpak build</command></para>
                 </listitem>
                 <listitem>
                     <para>Clean up the final build tree by removing unwanted files and e.g. stripping binaries</para>
                 </listitem>
                 <listitem>
-                    <para>Finish the application directory with <command>xdg-app build-finish</command></para>
+                    <para>Finish the application directory with <command>flatpak build-finish</command></para>
                 </listitem>
             </itemizedlist>
 
             After this you will end up with a build of the application in <arg choice="plain">DIRECTORY</arg>, which you can
-            export to a repository with the <command>xdg-app build-export</command> command.
+            export to a repository with the <command>flatpak build-export</command> command.
         </para>
         <para>
-            At each of the above steps xdg-app caches the result, and if you build the same file again, it will start
+            At each of the above steps flatpak caches the result, and if you build the same file again, it will start
             of at the first step where something changes. For instance the first version controlled source that had
             new commits added, or the first module where some changes to the <arg choice="plain">MANIFEST</arg> file caused
-            the build environment to change. This makes xdg-app-builder very efficient for incremental builds.
+            the build environment to change. This makes flatpak-builder very efficient for incremental builds.
         </para>
     </refsect1>
 
@@ -196,7 +196,7 @@
                 </varlistentry>
                 <varlistentry>
                     <term><option>finish-args</option> (array of strings)</term>
-                    <listitem><para>An array of arguments passed to the <command>xdg-app build-finish</command> command.</para></listitem>
+                    <listitem><para>An array of arguments passed to the <command>flatpak build-finish</command> command.</para></listitem>
                 </varlistentry>
                 <varlistentry>
                     <term><option>rename-desktop-file</option> (string)</term>
@@ -254,7 +254,7 @@
                 </varlistentry>
                 <varlistentry>
                     <term><option>build-args</option> (array of strings)</term>
-                    <listitem><para>This is an array containing extra options to pass to xdg-app build.</para></listitem>
+                    <listitem><para>This is an array containing extra options to pass to flatpak build.</para></listitem>
                 </varlistentry>
                 <varlistentry>
                     <term><option>strip</option> (boolean)</term>
@@ -588,10 +588,10 @@
                 <term><option>--run</option></term>
 
                 <listitem><para>
-                  Run a command in a sandbox based on the build dir. This starts xdg-app build, with some extra
+                  Run a command in a sandbox based on the build dir. This starts flatpak build, with some extra
                   arguments to give the same environment as the build, and the same permissions the final app
                   will have. The command to run must be the last argument passed to
-                  xdg-app-builder, after the directory and the manifest.
+                  flatpak-builder, after the directory and the manifest.
                 </para></listitem>
             </varlistentry>
 
@@ -701,14 +701,14 @@
         <title>Caching</title>
 
         <para>
-            xdg-app-builder caches sources and partial build results in
-            the .xdg-app-builder subdirectory of the current directory. If you
+            flatpak-builder caches sources and partial build results in
+            the .flatpak-builder subdirectory of the current directory. If you
             use <option>--keep-build-dirs</option>, build directories for each
             module are also stored here.
         </para>
 
         <para>
-            It is safe to remove the contents of the .xdg-app-builder
+            It is safe to remove the contents of the .flatpak-builder
             directory. This will force a full build the next time you build.
         </para>
 
@@ -718,7 +718,7 @@
         <title>Examples</title>
 
         <para>
-            <command>$ xdg-app-builder my-app-dir manifest.json</command>
+            <command>$ flatpak-builder my-app-dir manifest.json</command>
         </para>
 
         <para>
@@ -795,11 +795,11 @@
         <title>See also</title>
 
         <para>
-            <citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-build-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-build-build</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-build-finish</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-build-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-build-build</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-build-finish</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         </para>
 
     </refsect1>
diff --git a/doc/xdg-app-enter.xml b/doc/flatpak-enter.xml
index e0f6a12..9dd1d94 100644
--- a/doc/xdg-app-enter.xml
+++ b/doc/flatpak-enter.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="xdg-app-enter">
+<refentry id="flatpak-enter">
 
     <refentryinfo>
-        <title>xdg-app enter</title>
-        <productname>xdg-app</productname>
+        <title>flatpak enter</title>
+        <productname>flatpak</productname>
 
         <authorgroup>
             <author>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app enter</refentrytitle>
+        <refentrytitle>flatpak enter</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-enter</refname>
+        <refname>flatpak-enter</refname>
         <refpurpose>Enter an application</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app enter</command>
+                <command>flatpak enter</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="plain">MONITORPID</arg>
                 <arg choice="plain">COMMAND</arg>
@@ -92,7 +92,7 @@
         <title>Examples</title>
 
         <para>
-            <command>$ xdg-app enter 15345 sh</command>
+            <command>$ flatpak enter 15345 sh</command>
         </para>
 
     </refsect1>
@@ -101,8 +101,8 @@
         <title>See also</title>
 
         <para>
-            <citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-            <citerefentry><refentrytitle>xdg-app-run</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>flatpak-run</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         </para>
 
     </refsect1>
diff --git a/doc/xdg-app-export-file.xml b/doc/flatpak-export-file.xml
index 7c10e1b..057e58c 100644
--- a/doc/xdg-app-export-file.xml
+++ b/doc/flatpak-export-file.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="xdg-app-export-file">
+<refentry id="flatpak-export-file">
 
     <refentryinfo>
-        <title>xdg-app export-file</title>
-        <productname>xdg-app</productname>
+        <title>flatpak export-file</title>
+        <productname>flatpak</productname>
 
         <authorgroup>
             <author>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app export-file</refentrytitle>
+        <refentrytitle>flatpak export-file</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-export-file</refname>
+        <refname>flatpak-export-file</refname>
         <refpurpose>Export a file to a sandboxed application</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app export-file</command>
+                <command>flatpak export-file</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="plain">FILE</arg>
             </cmdsynopsis>
@@ -141,7 +141,7 @@
         <title>Examples</title>
 
         <para>
-            <command>$ xdg-app export-file --app=org.gnome.GEdit ~/test.txt</command>
+            <command>$ flatpak export-file --app=org.gnome.GEdit ~/test.txt</command>
         </para>
 <programlisting>
 /run/user/1000/doc/e52f9c6a/test.txt
@@ -153,8 +153,8 @@
         <title>See also</title>
 
         <para>
-            <citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-            <citerefentry><refentrytitle>xdg-app-run</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>flatpak-run</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         </para>
 
     </refsect1>
diff --git a/doc/xdg-app-info.xml b/doc/flatpak-info.xml
index 494a54b..bcd454c 100644
--- a/doc/xdg-app-info.xml
+++ b/doc/flatpak-info.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="xdg-app-info">
+<refentry id="flatpak-info">
 
     <refentryinfo>
-        <title>xdg-app info</title>
-        <productname>xdg-app</productname>
+        <title>flatpak info</title>
+        <productname>flatpak</productname>
 
         <authorgroup>
             <author>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app info</refentrytitle>
+        <refentrytitle>flatpak info</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-info</refname>
+        <refname>flatpak-info</refname>
         <refpurpose>Show information about installed application and/or runtime</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app info</command>
+                <command>flatpak info</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="plain">NAME</arg>
                 <arg choice="opt">BRANCH</arg>
@@ -152,7 +152,7 @@
         <title>Examples</title>
 
         <para>
-            <command>$ xdg-app --user list</command>
+            <command>$ flatpak --user list</command>
         </para>
 <programlisting>
 org.gnome.Builder
@@ -167,9 +167,9 @@ org.gnome.GEdit
         <title>See also</title>
 
         <para>
-            <citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-install-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-update-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-install-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-update-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         </para>
 
     </refsect1>
diff --git a/doc/xdg-app-install.xml b/doc/flatpak-install.xml
index bb8c6d6..bf8ae01 100644
--- a/doc/xdg-app-install.xml
+++ b/doc/flatpak-install.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="xdg-app-install">
+<refentry id="flatpak-install">
 
     <refentryinfo>
-        <title>xdg-app install</title>
-        <productname>xdg-app</productname>
+        <title>flatpak install</title>
+        <productname>flatpak</productname>
 
         <authorgroup>
             <author>
@@ -19,25 +19,25 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app install</refentrytitle>
+        <refentrytitle>flatpak install</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-install</refname>
+        <refname>flatpak-install</refname>
         <refpurpose>Install an application or runtime</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app install</command>
+                <command>flatpak install</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="plain">REMOTE</arg>
                 <arg choice="plain">NAME</arg>
                 <arg choice="opt">BRANCH</arg>
             </cmdsynopsis>
             <cmdsynopsis>
-                <command>xdg-app install</command>
+                <command>flatpak install</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="plain">--bundle</arg>
                 <arg choice="plain">FILENAME</arg>
@@ -58,7 +58,7 @@
             the specified <arg choice="plain">REMOTE</arg>, but you can limit this by using the --app or --runtime option.
         </para>
         <para>
-            Note that xdg-app allows to have multiple branches of an application and runtimes
+            Note that flatpak allows to have multiple branches of an application and runtimes
             installed and used at the same time. However, only version of an application one can be current,
             meaning its exported files (for instance desktop files and icons) are
             visible to the host. The last installed version is made current by
@@ -71,7 +71,7 @@
         <para>
             The alternative form of the command installs an application from a
             single-file bundle instead of a configured remote. Such bundles can
-            be created with the xdg-app build-bundle command.
+            be created with the flatpak build-bundle command.
         </para>
 
     </refsect1>
@@ -195,7 +195,7 @@
         <title>Examples</title>
 
         <para>
-            <command>$ xdg-app --user install test-repo org.gnome.GEdit</command>
+            <command>$ flatpak --user install test-repo org.gnome.GEdit</command>
         </para>
 
     </refsect1>
@@ -204,10 +204,10 @@
         <title>See also</title>
 
         <para>
-            <citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-update-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-list-apps</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-build-bundle</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-update-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-list-apps</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-build-bundle</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         </para>
 
     </refsect1>
diff --git a/doc/xdg-app-list.xml b/doc/flatpak-list.xml
index 001b092..5774319 100644
--- a/doc/xdg-app-list.xml
+++ b/doc/flatpak-list.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="xdg-app-list">
+<refentry id="flatpak-list">
 
     <refentryinfo>
-        <title>xdg-app list</title>
-        <productname>xdg-app</productname>
+        <title>flatpak list</title>
+        <productname>flatpak</productname>
 
         <authorgroup>
             <author>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app list</refentrytitle>
+        <refentrytitle>flatpak list</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-list</refname>
+        <refname>flatpak-list</refname>
         <refpurpose>List installed applications and/or runtimes</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app list</command>
+                <command>flatpak list</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
@@ -130,7 +130,7 @@
         <title>Examples</title>
 
         <para>
-            <command>$ xdg-app --user list</command>
+            <command>$ flatpak --user list</command>
         </para>
 <programlisting>
 org.gnome.Builder
@@ -145,9 +145,9 @@ org.gnome.GEdit
         <title>See also</title>
 
         <para>
-            <citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-install-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-update-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-install-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-update-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         </para>
 
     </refsect1>
diff --git a/doc/xdg-app-make-current.xml b/doc/flatpak-make-current.xml
index 00c9d50..936c2db 100644
--- a/doc/xdg-app-make-current.xml
+++ b/doc/flatpak-make-current.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="xdg-app-make-current">
+<refentry id="flatpak-make-current">
 
     <refentryinfo>
-        <title>xdg-app make-current</title>
-        <productname>xdg-app</productname>
+        <title>flatpak make-current</title>
+        <productname>flatpak</productname>
 
         <authorgroup>
             <author>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app make-current</refentrytitle>
+        <refentrytitle>flatpak make-current</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-make-current</refname>
+        <refname>flatpak-make-current</refname>
         <refpurpose>Make a specific version of an app current</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app make-current</command>
+                <command>flatpak make-current</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="plain">APP</arg>
                 <arg choice="plain">BRANCH</arg>
@@ -118,7 +118,7 @@
         <title>Examples</title>
 
         <para>
-            <command>$ xdg-app --user make-current org.gnome.GEdit 3.14</command>
+            <command>$ flatpak --user make-current org.gnome.GEdit 3.14</command>
         </para>
 
     </refsect1>
@@ -127,9 +127,9 @@
         <title>See also</title>
 
         <para>
-            <citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-install-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-list-apps</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-install-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-list-apps</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         </para>
 
     </refsect1>
diff --git a/doc/xdg-app-override.xml b/doc/flatpak-override.xml
index b87b3dc..50422c4 100644
--- a/doc/xdg-app-override.xml
+++ b/doc/flatpak-override.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="xdg-app-override">
+<refentry id="flatpak-override">
 
     <refentryinfo>
-        <title>xdg-app override</title>
-        <productname>xdg-app</productname>
+        <title>flatpak override</title>
+        <productname>flatpak</productname>
 
         <authorgroup>
             <author>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app override</refentrytitle>
+        <refentrytitle>flatpak override</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-override</refname>
+        <refname>flatpak-override</refname>
         <refpurpose>Override application requirements</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app override</command>
+                <command>flatpak override</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="plain">APP</arg>
             </cmdsynopsis>
@@ -47,7 +47,7 @@
           By default the application gets access to the resources it
           requested when it is started. But the user can override it
           on a particular instance by specifying extra arguments to
-          xdg-app run, or every time by using xdg-app override.
+          flatpak run, or every time by using flatpak override.
         </para>
 
     </refsect1>
@@ -212,10 +212,10 @@
         <title>Examples</title>
 
         <para>
-            <command>$ xdg-app override --nosocket=wayland org.gnome.GEdit</command>
+            <command>$ flatpak override --nosocket=wayland org.gnome.GEdit</command>
         </para>
         <para>
-            <command>$ xdg-app override --filesystem=home org.mozilla.Firefox</command>
+            <command>$ flatpak override --filesystem=home org.mozilla.Firefox</command>
         </para>
 
     </refsect1>
@@ -224,8 +224,8 @@
         <title>See also</title>
 
         <para>
-            <citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-            <citerefentry><refentrytitle>xdg-app-run</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>flatpak-run</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         </para>
 
     </refsect1>
diff --git a/doc/xdg-app-remote-add.xml b/doc/flatpak-remote-add.xml
index 4b4af25..f0a1c47 100644
--- a/doc/xdg-app-remote-add.xml
+++ b/doc/flatpak-remote-add.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="xdg-app-remote-add">
+<refentry id="flatpak-remote-add">
 
     <refentryinfo>
-        <title>xdg-app remote-add</title>
-        <productname>xdg-app</productname>
+        <title>flatpak remote-add</title>
+        <productname>flatpak</productname>
 
         <authorgroup>
             <author>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app remote-add</refentrytitle>
+        <refentrytitle>flatpak remote-add</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-remote-add</refname>
+        <refname>flatpak-remote-add</refname>
         <refpurpose>Add a remote repository</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app remote-add</command>
+                <command>flatpak remote-add</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="plain">NAME</arg>
                 <arg choice="plain">LOCATION</arg>
@@ -41,7 +41,7 @@
         <title>Description</title>
 
         <para>
-            Adds a remote repository to the xdg-app repository configuration.
+            Adds a remote repository to the flatpak repository configuration.
             <arg choice="plain">NAME</arg> is the name for the new remote, and
             <arg choice="plain">LOCATION</arg> is the url or pathname for the repository.
         </para>
@@ -177,7 +177,7 @@
         <title>Examples</title>
 
         <para>
-            <command>$ xdg-app --user remote-add --no-gpg-verify test-repo https://people.gnome.org/~alexl/gnome-sdk/repo/</command>
+            <command>$ flatpak --user remote-add --no-gpg-verify test-repo https://people.gnome.org/~alexl/gnome-sdk/repo/</command>
         </para>
     </refsect1>
 
@@ -185,10 +185,10 @@
         <title>See also</title>
 
             <para>
-                <citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                <citerefentry><refentrytitle>xdg-app-modify-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                <citerefentry><refentrytitle>xdg-app-delete-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                <citerefentry><refentrytitle>xdg-app-list-remotes</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                <citerefentry><refentrytitle>flatpak-modify-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                <citerefentry><refentrytitle>flatpak-delete-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                <citerefentry><refentrytitle>flatpak-list-remotes</refentrytitle><manvolnum>1</manvolnum></citerefentry>
             </para>
     </refsect1>
 
diff --git a/doc/xdg-app-remote-delete.xml b/doc/flatpak-remote-delete.xml
index d3f4d03..9f1cfbe 100644
--- a/doc/xdg-app-remote-delete.xml
+++ b/doc/flatpak-remote-delete.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="xdg-app-remote-delete">
+<refentry id="flatpak-remote-delete">
 
     <refentryinfo>
-        <title>xdg-app remote-delete</title>
-        <productname>xdg-app</productname>
+        <title>flatpak remote-delete</title>
+        <productname>flatpak</productname>
 
         <authorgroup>
             <author>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app remote-delete</refentrytitle>
+        <refentrytitle>flatpak remote-delete</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-remote-delete</refname>
+        <refname>flatpak-remote-delete</refname>
         <refpurpose>Delete a remote repository</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app remote-delete</command>
+                <command>flatpak remote-delete</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="plain">NAME</arg>
             </cmdsynopsis>
@@ -40,7 +40,7 @@
         <title>Description</title>
 
         <para>
-            Removes a remote repository from the xdg-app repository configuration.
+            Removes a remote repository from the flatpak repository configuration.
             <arg choice="plain">NAME</arg> is the name of an existing remote.
         </para>
         <para>
@@ -104,7 +104,7 @@
         <title>Examples</title>
 
         <para>
-            <command>$ xdg-app --user remote-delete dried-raisins</command>
+            <command>$ flatpak --user remote-delete dried-raisins</command>
         </para>
     </refsect1>
 
@@ -112,10 +112,10 @@
         <title>See also</title>
 
             <para>
-                <citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                <citerefentry><refentrytitle>xdg-app-add-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                <citerefentry><refentrytitle>xdg-app-modify-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                <citerefentry><refentrytitle>xdg-app-list-remotes</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                <citerefentry><refentrytitle>flatpak-add-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                <citerefentry><refentrytitle>flatpak-modify-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                <citerefentry><refentrytitle>flatpak-list-remotes</refentrytitle><manvolnum>1</manvolnum></citerefentry>
             </para>
     </refsect1>
 
diff --git a/doc/xdg-app-remote-list.xml b/doc/flatpak-remote-list.xml
index 5babd57..552c5cc 100644
--- a/doc/xdg-app-remote-list.xml
+++ b/doc/flatpak-remote-list.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="xdg-app-remote-list">
+<refentry id="flatpak-remote-list">
 
     <refentryinfo>
-        <title>xdg-app remote-list</title>
-        <productname>xdg-app</productname>
+        <title>flatpak remote-list</title>
+        <productname>flatpak</productname>
 
         <authorgroup>
             <author>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app remote-list</refentrytitle>
+        <refentrytitle>flatpak remote-list</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-remote-list</refname>
+        <refname>flatpak-remote-list</refname>
         <refpurpose>List remote repositories</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app remote-list</command>
+                <command>flatpak remote-list</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
@@ -119,7 +119,7 @@
         <title>Examples</title>
 
         <para>
-            <command>$ xdg-app remote-list --user --show-details</command>
+            <command>$ flatpak remote-list --user --show-details</command>
         </para>
 <programlisting>
 testrepo	Test Repository	 http://209.132.179.91/repo/ no-gpg-verify
@@ -130,9 +130,9 @@ testrepo	Test Repository	 http://209.132.179.91/repo/ no-gpg-verify
         <title>See also</title>
 
             <para>
-                <citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                <citerefentry><refentrytitle>xdg-app-add-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                <citerefentry><refentrytitle>xdg-app-delete-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                <citerefentry><refentrytitle>flatpak-add-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                <citerefentry><refentrytitle>flatpak-delete-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>
             </para>
     </refsect1>
 
diff --git a/doc/xdg-app-remote-ls.xml b/doc/flatpak-remote-ls.xml
index a1b57f0..bbc6380 100644
--- a/doc/xdg-app-remote-ls.xml
+++ b/doc/flatpak-remote-ls.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="xdg-app-remote-ls">
+<refentry id="flatpak-remote-ls">
 
     <refentryinfo>
-        <title>xdg-app remote-ls</title>
-        <productname>xdg-app</productname>
+        <title>flatpak remote-ls</title>
+        <productname>flatpak</productname>
 
         <authorgroup>
             <author>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app remote-ls</refentrytitle>
+        <refentrytitle>flatpak remote-ls</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-remote-ls</refname>
+        <refname>flatpak-remote-ls</refname>
         <refpurpose>Show available runtimes and applications</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app remote-ls</command>
+                <command>flatpak remote-ls</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="plain">REMOTE</arg>
             </cmdsynopsis>
@@ -42,7 +42,7 @@
         <para>
             Shows runtimes and applications that are available in the
             remote repository with the name <arg choice="plain">REMOTE</arg>.
-            You can find all configured remote repositories with xdg-app list-repos.
+            You can find all configured remote repositories with flatpak list-repos.
         </para>
         <para>
             Unless overridden with the --user option, this command uses
@@ -138,7 +138,7 @@
         <title>Examples</title>
 
         <para>
-            <command>$ xdg-app --user remote-ls --only-apps testrepo</command>
+            <command>$ flatpak --user remote-ls --only-apps testrepo</command>
         </para>
 <programlisting>
 org.gnome.Builder
diff --git a/doc/xdg-app-remote-modify.xml b/doc/flatpak-remote-modify.xml
index 12f9e0b..2462b1c 100644
--- a/doc/xdg-app-remote-modify.xml
+++ b/doc/flatpak-remote-modify.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="xdg-app-remote-modify">
+<refentry id="flatpak-remote-modify">
 
     <refentryinfo>
-        <title>xdg-app remote-modify</title>
-        <productname>xdg-app</productname>
+        <title>flatpak remote-modify</title>
+        <productname>flatpak</productname>
 
         <authorgroup>
             <author>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app remote-modify</refentrytitle>
+        <refentrytitle>flatpak remote-modify</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-remote-modify</refname>
+        <refname>flatpak-remote-modify</refname>
         <refpurpose>Modify a remote repository</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app remote-modify</command>
+                <command>flatpak remote-modify</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="plain">NAME</arg>
             </cmdsynopsis>
@@ -40,7 +40,7 @@
         <title>Description</title>
 
         <para>
-            Modifies options for an existing remote repository in the xdg-app repository configuration.
+            Modifies options for an existing remote repository in the flatpak repository configuration.
             <arg choice="plain">NAME</arg> is the name for the remote.
         </para>
         <para>
@@ -193,7 +193,7 @@
         <title>Examples</title>
 
         <para>
-            <command>$ xdg-app --user remote-modify --no-gpg-verify test-repo</command>
+            <command>$ flatpak --user remote-modify --no-gpg-verify test-repo</command>
         </para>
     </refsect1>
 
@@ -201,10 +201,10 @@
         <title>See also</title>
 
             <para>
-                <citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                <citerefentry><refentrytitle>xdg-app-add-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                <citerefentry><refentrytitle>xdg-app-delete-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                <citerefentry><refentrytitle>xdg-app-list-remotes</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                <citerefentry><refentrytitle>flatpak-add-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                <citerefentry><refentrytitle>flatpak-delete-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                <citerefentry><refentrytitle>flatpak-list-remotes</refentrytitle><manvolnum>1</manvolnum></citerefentry>
             </para>
     </refsect1>
 
diff --git a/doc/xdg-app-run.xml b/doc/flatpak-run.xml
index 256b6e8..9f99c25 100644
--- a/doc/xdg-app-run.xml
+++ b/doc/flatpak-run.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="xdg-app-run">
+<refentry id="flatpak-run">
 
     <refentryinfo>
-        <title>xdg-app run</title>
-        <productname>xdg-app</productname>
+        <title>flatpak run</title>
+        <productname>flatpak</productname>
 
         <authorgroup>
             <author>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app run</refentrytitle>
+        <refentrytitle>flatpak run</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-run</refname>
+        <refname>flatpak-run</refname>
         <refpurpose>Run an application</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app run</command>
+                <command>flatpak run</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="plain">APP</arg>
                 <arg choice="opt" rep="repeat">ARG</arg>
@@ -46,7 +46,7 @@
             Extra arguments are passed on to the application.
         </para>
         <para>
-            xdg-app creates a sandboxed environment for the application to run in
+            flatpak creates a sandboxed environment for the application to run in
             by mounting the right runtime at <filename>/usr</filename> and a writable
             directory at <filename>/var</filename>, whose content is preserved between
             application runs. The application itself is mounted at <filename>/app</filename>.
@@ -315,10 +315,10 @@
         <title>Examples</title>
 
         <para>
-            <command>$ xdg-app run org.gnome.GEdit</command>
+            <command>$ flatpak run org.gnome.GEdit</command>
         </para>
         <para>
-            <command>$ xdg-app run --devel --command=bash org.gnome.Builder</command>
+            <command>$ flatpak run --devel --command=bash org.gnome.Builder</command>
         </para>
 
     </refsect1>
@@ -327,9 +327,9 @@
         <title>See also</title>
 
         <para>
-            <citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-            <citerefentry><refentrytitle>xdg-app-override</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-            <citerefentry><refentrytitle>xdg-app-enter</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>flatpak-override</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>flatpak-enter</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         </para>
 
     </refsect1>
diff --git a/doc/xdg-app-uninstall.xml b/doc/flatpak-uninstall.xml
index 4feb079..3152965 100644
--- a/doc/xdg-app-uninstall.xml
+++ b/doc/flatpak-uninstall.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="xdg-app-uninstall">
+<refentry id="flatpak-uninstall">
 
     <refentryinfo>
         <title>dxg-app uninstall</title>
-        <productname>xdg-app</productname>
+        <productname>flatpak</productname>
 
         <authorgroup>
             <author>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app uninstall</refentrytitle>
+        <refentrytitle>flatpak uninstall</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-uninstall</refname>
+        <refname>flatpak-uninstall</refname>
         <refpurpose>Uninstall an application or runtime</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app uninstall</command>
+                <command>flatpak uninstall</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="plain">NAME</arg>
                 <arg choice="opt">BRANCH</arg>
@@ -158,7 +158,7 @@
         <title>Examples</title>
 
         <para>
-            <command>$ xdg-app --user uninstall org.gnome.GEdit</command>
+            <command>$ flatpak --user uninstall org.gnome.GEdit</command>
         </para>
 
     </refsect1>
diff --git a/doc/xdg-app-update.xml b/doc/flatpak-update.xml
index 8c29342..684e333 100644
--- a/doc/xdg-app-update.xml
+++ b/doc/flatpak-update.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="xdg-app-update">
+<refentry id="flatpak-update">
 
     <refentryinfo>
-        <title>xdg-app update</title>
-        <productname>xdg-app</productname>
+        <title>flatpak update</title>
+        <productname>flatpak</productname>
 
         <authorgroup>
             <author>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app update</refentrytitle>
+        <refentrytitle>flatpak update</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-update</refname>
+        <refname>flatpak-update</refname>
         <refpurpose>Update a runtime</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app update</command>
+                <command>flatpak update</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="opt">NAME</arg>
                 <arg choice="opt">BRANCH</arg>
@@ -184,7 +184,7 @@
         <title>Examples</title>
 
         <para>
-            <command>$ xdg-app --user update org.gnome.GEdit</command>
+            <command>$ flatpak --user update org.gnome.GEdit</command>
         </para>
 
     </refsect1>
@@ -193,9 +193,9 @@
         <title>See also</title>
 
         <para>
-            <citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-install-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-list-apps</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-install-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>flatpak-list-apps</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         </para>
 
     </refsect1>
diff --git a/doc/xdg-app.xml b/doc/flatpak.xml
index f5a1d0c..e7b144a 100644
--- a/doc/xdg-app.xml
+++ b/doc/flatpak.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="xdg-app">
+<refentry id="flatpak">
 
     <refentryinfo>
-        <title>xdg-app</title>
-        <productname>xdg-app</productname>
+        <title>flatpak</title>
+        <productname>flatpak</productname>
 
         <authorgroup>
             <author>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app</refentrytitle>
+        <refentrytitle>flatpak</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app</refname>
+        <refname>flatpak</refname>
         <refpurpose>Build, install and run applications and runtimes</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app</command>
+                <command>flatpak</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="req">COMMAND</arg>
             </cmdsynopsis>
@@ -40,18 +40,18 @@
         <title>Description</title>
 
         <para>
-            xdg-app is a tool for managing applications and the runtimes
-            they use. In the xdg-app model, applications can be built and
+            flatpak is a tool for managing applications and the runtimes
+            they use. In the flatpak model, applications can be built and
             distributed independently from the host system they are used
             on, and they are isolated from the host system ('sandboxed')
             to some degree, at runtime.
         </para>
 
         <para>
-            xdg-app can operate in system-wide or per-user mode. The system-wide
+            flatpak can operate in system-wide or per-user mode. The system-wide
             data (runtimes, applications and configuration) is located in
-            <filename>$prefix/share/xdg-app/</filename>, and the per-user
-            data is in <filename>$HOME/.local/share/xdg-app/</filename>.
+            <filename>$prefix/share/flatpak/</filename>, and the per-user
+            data is in <filename>$HOME/.local/share/flatpak/</filename>.
             Below these locations, there is a local repository in the
             <filename>repo/</filename> subdirectory and installed runtimes
             and applications are in the corresponding <filename>runtime/</filename>
@@ -59,7 +59,7 @@
         </para>
 
         <para>
-            xdg-app uses OSTree to distribute and deploy data. The repositories
+            flatpak uses OSTree to distribute and deploy data. The repositories
             it uses are OSTree repositories and can be manipulated with the
             <command>ostree</command> utility. Installed runtimes and
             applications are OSTree checkouts.
@@ -107,35 +107,35 @@
 
         <variablelist>
             <varlistentry>
-                <term><citerefentry><refentrytitle>xdg-app-install</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+                <term><citerefentry><refentrytitle>flatpak-install</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     Install an application or a runtime from a remote or bundle.
                 </para></listitem>
             </varlistentry>
             <varlistentry>
-                <term><citerefentry><refentrytitle>xdg-app-update</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+                <term><citerefentry><refentrytitle>flatpak-update</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     Update an installed application or runtime.
                 </para></listitem>
             </varlistentry>
             <varlistentry>
-                <term><citerefentry><refentrytitle>xdg-app-uninstall</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+                <term><citerefentry><refentrytitle>flatpak-uninstall</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     Uninstall an installed application or runtime.
                 </para></listitem>
             </varlistentry>
             <varlistentry>
-                <term><citerefentry><refentrytitle>xdg-app-list</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+                <term><citerefentry><refentrytitle>flatpak-list</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     List installed applications and/or runtimes.
                 </para></listitem>
             </varlistentry>
             <varlistentry>
-                <term><citerefentry><refentrytitle>xdg-app-info</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+                <term><citerefentry><refentrytitle>flatpak-info</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     Show information for an installed application or runtime.
@@ -148,28 +148,28 @@
 
         <variablelist>
             <varlistentry>
-                <term><citerefentry><refentrytitle>xdg-app-run</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+                <term><citerefentry><refentrytitle>flatpak-run</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     Run an application.
                 </para></listitem>
             </varlistentry>
             <varlistentry>
-                <term><citerefentry><refentrytitle>xdg-app-override</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+                <term><citerefentry><refentrytitle>flatpak-override</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     Override permissions for an application.
                 </para></listitem>
             </varlistentry>
             <varlistentry>
-                <term><citerefentry><refentrytitle>xdg-app-export-file</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+                <term><citerefentry><refentrytitle>flatpak-export-file</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     Grant an application access to a specific file.
                 </para></listitem>
             </varlistentry>
             <varlistentry>
-                <term><citerefentry><refentrytitle>xdg-app-enter</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+                <term><citerefentry><refentrytitle>flatpak-enter</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     Enter the namespace of a running application.
@@ -181,35 +181,35 @@
 
         <variablelist>
             <varlistentry>
-                <term><citerefentry><refentrytitle>xdg-app-remote-add</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+                <term><citerefentry><refentrytitle>flatpak-remote-add</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     Add a new remote repository.
                 </para></listitem>
             </varlistentry>
             <varlistentry>
-                <term><citerefentry><refentrytitle>xdg-app-remote-modify</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+                <term><citerefentry><refentrytitle>flatpak-remote-modify</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     Modify properties of a configured remote repository.
                 </para></listitem>
             </varlistentry>
             <varlistentry>
-                <term><citerefentry><refentrytitle>xdg-app-remote-delete</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+                <term><citerefentry><refentrytitle>flatpak-remote-delete</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     Delete a configured remote repository.
                 </para></listitem>
             </varlistentry>
             <varlistentry>
-                <term><citerefentry><refentrytitle>xdg-app-remote-list</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+                <term><citerefentry><refentrytitle>flatpak-remote-list</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     List all configured remote repositories.
                 </para></listitem>
             </varlistentry>
             <varlistentry>
-                <term><citerefentry><refentrytitle>xdg-app-remote-ls</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+                <term><citerefentry><refentrytitle>flatpak-remote-ls</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     List contents of a configured remote repository.
@@ -221,56 +221,56 @@
 
         <variablelist>
             <varlistentry>
-                <term><citerefentry><refentrytitle>xdg-app-build-init</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+                <term><citerefentry><refentrytitle>flatpak-build-init</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     Initialize a build directory.
                 </para></listitem>
             </varlistentry>
             <varlistentry>
-                <term><citerefentry><refentrytitle>xdg-app-build</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+                <term><citerefentry><refentrytitle>flatpak-build</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     Run a build command in a build directory.
                 </para></listitem>
             </varlistentry>
             <varlistentry>
-                <term><citerefentry><refentrytitle>xdg-app-build-finish</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+                <term><citerefentry><refentrytitle>flatpak-build-finish</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     Finalizes a build directory for export.
                 </para></listitem>
             </varlistentry>
             <varlistentry>
-                <term><citerefentry><refentrytitle>xdg-app-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+                <term><citerefentry><refentrytitle>flatpak-build-export</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     Export a build directory to a repository.
                 </para></listitem>
             </varlistentry>
             <varlistentry>
-                <term><citerefentry><refentrytitle>xdg-app-build-bundle</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+                <term><citerefentry><refentrytitle>flatpak-build-bundle</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     Create a bundle file from a build directory.
                 </para></listitem>
             </varlistentry>
             <varlistentry>
-                <term><citerefentry><refentrytitle>xdg-app-build-import-bundle</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+                <term><citerefentry><refentrytitle>flatpak-build-import-bundle</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     Import a file bundle into a local repository.
                 </para></listitem>
             </varlistentry>
             <varlistentry>
-                <term><citerefentry><refentrytitle>xdg-app-build-update-repo</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+                <term><citerefentry><refentrytitle>flatpak-build-update-repo</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     Update the summary file in a repository.
                 </para></listitem>
             </varlistentry>
             <varlistentry>
-                <term><citerefentry><refentrytitle>xdg-app-build-sign</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+                <term><citerefentry><refentrytitle>flatpak-build-sign</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     Sign an application or runtime after its been exported.
diff --git a/doc/reference/.gitignore b/doc/reference/.gitignore
index 9f06b7e..7ee8382 100644
--- a/doc/reference/.gitignore
+++ b/doc/reference/.gitignore
@@ -2,15 +2,15 @@ html/
 xml/
 *.stamp
 *.bak
-xdg-app-decl-list.txt
-xdg-app-decl.txt
-xdg-app-overrides.txt
-xdg-app-undeclared.txt
-xdg-app-undocumented.txt
-xdg-app-unused.txt
-xdg-app.args
-xdg-app.hierarchy
-xdg-app.interfaces
-xdg-app.prerequisites
-xdg-app.signals
-xdg-app.types
+flatpak-decl-list.txt
+flatpak-decl.txt
+flatpak-overrides.txt
+flatpak-undeclared.txt
+flatpak-undocumented.txt
+flatpak-unused.txt
+flatpak.args
+flatpak.hierarchy
+flatpak.interfaces
+flatpak.prerequisites
+flatpak.signals
+flatpak.types
diff --git a/doc/reference/version.xml.in b/doc/reference/version.xml.in
index e1b2fdf..a1116ea 100644
--- a/doc/reference/version.xml.in
+++ b/doc/reference/version.xml.in
@@ -1 +1 @@
-@XDG_APP_MAJOR_VERSION@.@XDG_APP_MINOR_VERSION@.@XDG_APP_MICRO_VERSION@
+@FLATPAK_MAJOR_VERSION@.@FLATPAK_MINOR_VERSION@.@FLATPAK_MICRO_VERSION@
diff --git a/document-portal/xdg-document-portal.service.in b/document-portal/xdg-document-portal.service.in
index ac7769b..66f9cbd 100644
--- a/document-portal/xdg-document-portal.service.in
+++ b/document-portal/xdg-document-portal.service.in
@@ -1,5 +1,5 @@
 [Unit]
-Description=xdg-app document portal service
+Description=flatpak document portal service
 
 [Service]
 BusName=org.freedesktop.portal.Documents
diff --git a/document-portal/xdp-main.c b/document-portal/xdp-main.c
index 52b0b93..28e3509 100644
--- a/document-portal/xdp-main.c
+++ b/document-portal/xdp-main.c
@@ -36,7 +36,7 @@ typedef struct
 
 static GMainLoop *loop = NULL;
 static FlatpakDb *db = NULL;
-static XdgAppPermissionStore *permission_store;
+static FlatpakPermissionStore *permission_store;
 static int daemon_event_fd = -1;
 static int final_exit_status = 0;
 static dev_t fuse_dev = 0;
@@ -89,7 +89,7 @@ do_set_permissions (FlatpakDbEntry    *entry,
 
   if (persist_entry (new_entry))
     {
-      xdg_app_permission_store_call_set_permission (permission_store,
+      flatpak_permission_store_call_set_permission (permission_store,
                                                     TABLE_NAME,
                                                     FALSE,
                                                     doc_id,
@@ -243,7 +243,7 @@ portal_delete (GDBusMethodInvocation *invocation,
     flatpak_db_set_entry (db, id, NULL);
 
     if (persist_entry (entry))
-      xdg_app_permission_store_call_delete (permission_store, TABLE_NAME,
+      flatpak_permission_store_call_delete (permission_store, TABLE_NAME,
                                             id, NULL, NULL, NULL);
   }
 
@@ -303,7 +303,7 @@ do_create_doc (struct stat *parent_st_buf, const char *path, gboolean reuse_exis
 
   if (persistent)
     {
-      xdg_app_permission_store_call_set (permission_store,
+      flatpak_permission_store_call_set (permission_store,
                                          TABLE_NAME,
                                          TRUE,
                                          id,
@@ -821,7 +821,7 @@ main (int    argc,
       do_exit (3);
     }
 
-  permission_store = xdg_app_permission_store_proxy_new_sync (session_bus, G_DBUS_PROXY_FLAGS_NONE,
+  permission_store = flatpak_permission_store_proxy_new_sync (session_bus, G_DBUS_PROXY_FLAGS_NONE,
                                                               "org.freedesktop.Flatpak",
                                                               "/org/freedesktop/Flatpak/PermissionStore",
                                                               NULL, &error);
diff --git a/env.d/xdg-app.env.in b/env.d/flatpak.env.in
index b421ee6..b421ee6 100644
--- a/env.d/xdg-app.env.in
+++ b/env.d/flatpak.env.in
diff --git a/lib/flatpak-error.c b/lib/flatpak-error.c
index 806fbe9..c2b550b 100644
--- a/lib/flatpak-error.c
+++ b/lib/flatpak-error.c
@@ -1,4 +1,4 @@
-/* xdg-app-error.c
+/* flatpak-error.c
  *
  * Copyright (C) 2015 Red Hat, Inc
  *
@@ -26,9 +26,9 @@
 #include <gio/gio.h>
 
 /**
- * SECTION:xdg-app-error
+ * SECTION:flatpak-error
  * @Title: Error codes
  *
  */
 
-G_DEFINE_QUARK (xdg - app - error - quark, flatpak_error)
+G_DEFINE_QUARK (flatpak-error-quark, flatpak_error)
diff --git a/lib/flatpak-error.h b/lib/flatpak-error.h
index 9c7b593..58380e1 100644
--- a/lib/flatpak-error.h
+++ b/lib/flatpak-error.h
@@ -1,4 +1,4 @@
-/* xdg-app-error.c
+/* flatpak-error.c
  *
  * Copyright (C) 2015 Red Hat, Inc
  *
diff --git a/lib/flatpak-installation.c b/lib/flatpak-installation.c
index 5e9d949..40ba33c 100644
--- a/lib/flatpak-installation.c
+++ b/lib/flatpak-installation.c
@@ -34,15 +34,15 @@
 #include "flatpak-error.h"
 
 /**
- * SECTION:xdg-app-installation
+ * SECTION:flatpak-installation
  * @Title: FlatpakInstallation
  * @Short_description: Installation information
  *
  * FlatpakInstallation is the toplevel object that software installers
- * should use to operate on an xdg-apps.
+ * should use to operate on an flatpak applications.
  *
  * An FlatpakInstallation object provides information about an installation
- * location for xdg-app applications. Typical installation locations are either
+ * location for flatpak applications. Typical installation locations are either
  * system-wide (in /var/lib/xdg-app) or per-user (in ~/.local/share/xdg-app).
  *
  * FlatpakInstallation can list configured remotes as well as installed application
@@ -804,14 +804,14 @@ progress_cb (OstreeAsyncProgress *progress, gpointer user_data)
 /**
  * flatpak_installation_install_bundle:
  * @self: a #FlatpakInstallation
- * @file: a #GFile that is an xdg-app bundle
+ * @file: a #GFile that is an flatpak bundle
  * @progress: (scope call): progress callback
  * @progress_data: user data passed to @progress
  * @cancellable: (nullable): a #GCancellable
  * @error: return location for a #GError
  *
- * Install an application or runtime from an xdg-app bundle file.
- * See xdg-app-build-bundle(1) for how to create brundles.
+ * Install an application or runtime from an flatpak bundle file.
+ * See flatpak-build-bundle(1) for how to create brundles.
  *
  * Returns: (transfer full): The ref for the newly installed app or %NULL on failure
  */
@@ -1273,7 +1273,7 @@ flatpak_installation_fetch_remote_size_sync2 (FlatpakInstallation *self,
  *
  * This is deprecated, use flatpak_installation_fetch_remote_metadata_sync2
  *
- * Returns: (transfer full): a #GBytes containing the xdg-app metadata file,
+ * Returns: (transfer full): a #GBytes containing the flatpak metadata file,
  *   or %NULL if an error occurred
  */
 GBytes *
@@ -1308,7 +1308,7 @@ flatpak_installation_fetch_remote_metadata_sync (FlatpakInstallation *self,
  *
  * Obtains the metadata file from a commit.
  *
- * Returns: (transfer full): a #GBytes containing the xdg-app metadata file,
+ * Returns: (transfer full): a #GBytes containing the flatpak metadata file,
  *   or %NULL if an error occurred
  */
 GBytes *
diff --git a/lib/flatpak-installed-ref.c b/lib/flatpak-installed-ref.c
index 4915064..9e26394 100644
--- a/lib/flatpak-installed-ref.c
+++ b/lib/flatpak-installed-ref.c
@@ -27,7 +27,7 @@
 #include "flatpak-enum-types.h"
 
 /**
- * SECTION:xdg-app-installed-ref
+ * SECTION:flatpak-installed-ref
  * @Title: FlatpakInstalledRef
  * @Short_description: Installed application reference
  *
diff --git a/lib/flatpak-ref.c b/lib/flatpak-ref.c
index 686940b..ba28b07 100644
--- a/lib/flatpak-ref.c
+++ b/lib/flatpak-ref.c
@@ -25,11 +25,11 @@
 #include "flatpak-enum-types.h"
 
 /**
- * SECTION:xdg-app-ref
+ * SECTION:flatpak-ref
  * @Title: FlatpakRef
  * @Short_description: Application reference
  *
- * Currently xdg-app manages two types of binary artifacts: applications, and
+ * Currently flatpak manages two types of binary artifacts: applications, and
  * runtimes. Applications contain a program that desktop users can run, while
  * runtimes contain only libraries and data. An FlatpakRef object (or short: ref)
  * can refer to either of these.
diff --git a/lib/flatpak-remote-ref.c b/lib/flatpak-remote-ref.c
index bfaad1b..a62565a 100644
--- a/lib/flatpak-remote-ref.c
+++ b/lib/flatpak-remote-ref.c
@@ -28,7 +28,7 @@
 #include "flatpak-enum-types.h"
 
 /**
- * SECTION:xdg-app-remote-ref
+ * SECTION:flatpak-remote-ref
  * @Title: FlatpakRemoteRef
  * @Short_description: Remote application reference
  *
diff --git a/lib/flatpak-remote.c b/lib/flatpak-remote.c
index 1e1528a..6a860c5 100644
--- a/lib/flatpak-remote.c
+++ b/lib/flatpak-remote.c
@@ -28,7 +28,7 @@
 #include <string.h>
 
 /**
- * SECTION:xdg-app-remote
+ * SECTION:flatpak-remote
  * @Short_description: Remote repository
  * @Title: FlatpakRemote
  *
diff --git a/lib/flatpak-version-macros.h.in b/lib/flatpak-version-macros.h.in
index c010a5c..21e858a 100644
--- a/lib/flatpak-version-macros.h.in
+++ b/lib/flatpak-version-macros.h.in
@@ -34,7 +34,7 @@
 #endif
 
 /**
- * SECTION:xdg-app-version-macros
+ * SECTION:flatpak-version-macros
  * @Title: Version information
  */
 
diff --git a/lib/test-lib.c b/lib/test-lib.c
index 869807e..bd6f448 100644
--- a/lib/test-lib.c
+++ b/lib/test-lib.c
@@ -92,7 +92,7 @@ main (int argc, char *argv[])
 
   g_print ("\n**** Loading bundle\n");
   {
-    g_autoptr(GFile) f = g_file_new_for_commandline_arg ("tests/hello.xdgapp");
+    g_autoptr(GFile) f = g_file_new_for_commandline_arg ("tests/hello.pak");
     g_autoptr(FlatpakBundleRef) bundle = flatpak_bundle_ref_new (f, &error);
     if (bundle == NULL)
       {
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6913e1f..1dc8d83 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1 +1 @@
-system-helper/org.freedesktop.XdgApp.policy.in
+system-helper/org.freedesktop.Flatpak.policy.in
diff --git a/profile/xdg-app.sh.in b/profile/flatpak.sh.in
index 4c86566..0fba9ee 100644
--- a/profile/xdg-app.sh.in
+++ b/profile/flatpak.sh.in
@@ -1,4 +1,4 @@
-# @sysconfdir@/profile.d/xdg-app.sh - set XDG_DATA_DIRS
+# @sysconfdir@/profile.d/flatpak.sh - set XDG_DATA_DIRS
 
 XDG_DATA_DIRS="${XDG_DATA_DIRS:-$HOME/.local/share/xdg-app/exports/share:@localstatedir@/xdg-app/exports/share/:/usr/local/share/:/usr/share/}"
 export XDG_DATA_DIRS
diff --git a/session-helper/Makefile.am.inc b/session-helper/Makefile.am.inc
index 5c93161..89dca77 100644
--- a/session-helper/Makefile.am.inc
+++ b/session-helper/Makefile.am.inc
@@ -1,18 +1,18 @@
 libexec_PROGRAMS += \
-	xdg-app-session-helper \
+	flatpak-session-helper \
 	$(NULL)
 
-service_in_files += session-helper/xdg-app-session-helper.service.in
-systemduserunit_DATA += session-helper/xdg-app-session-helper.service
+service_in_files += session-helper/flatpak-session-helper.service.in
+systemduserunit_DATA += session-helper/flatpak-session-helper.service
 
-service_in_files += session-helper/org.freedesktop.XdgApp.service.in
-dbus_service_DATA += session-helper/org.freedesktop.XdgApp.service
+service_in_files += session-helper/org.freedesktop.Flatpak.service.in
+dbus_service_DATA += session-helper/org.freedesktop.Flatpak.service
 
-xdg_app_session_helper_SOURCES = \
+flatpak_session_helper_SOURCES = \
 	session-helper/flatpak-session-helper.c	\
 	session-helper/flatpak-permission-store.c	\
 	session-helper/flatpak-permission-store.h	\
 	$(NULL)
 
-xdg_app_session_helper_LDADD = $(BASE_LIBS) libflatpak-common.la
-xdg_app_session_helper_CFLAGS = $(BASE_CFLAGS)
+flatpak_session_helper_LDADD = $(BASE_LIBS) libflatpak-common.la
+flatpak_session_helper_CFLAGS = $(BASE_CFLAGS)
diff --git a/session-helper/flatpak-permission-store.c b/session-helper/flatpak-permission-store.c
index 7cab93f..89da8e2 100644
--- a/session-helper/flatpak-permission-store.c
+++ b/session-helper/flatpak-permission-store.c
@@ -144,9 +144,9 @@ ensure_writeout (Table                 *table,
 }
 
 static gboolean
-handle_list (XdgAppPermissionStore *object,
-             GDBusMethodInvocation *invocation,
-             const gchar           *table_name)
+handle_list (FlatpakPermissionStore *object,
+             GDBusMethodInvocation  *invocation,
+             const gchar            *table_name)
 {
   Table *table;
 
@@ -158,7 +158,7 @@ handle_list (XdgAppPermissionStore *object,
 
   ids = flatpak_db_list_ids (table->db);
 
-  xdg_app_permission_store_complete_list (object, invocation, (const char * const *) ids);
+  flatpak_permission_store_complete_list (object, invocation, (const char * const *) ids);
 
   return TRUE;
 }
@@ -186,10 +186,10 @@ get_app_permissions (FlatpakDbEntry *entry)
 }
 
 static gboolean
-handle_lookup (XdgAppPermissionStore *object,
-               GDBusMethodInvocation *invocation,
-               const gchar           *table_name,
-               const gchar           *id)
+handle_lookup (FlatpakPermissionStore *object,
+               GDBusMethodInvocation  *invocation,
+               const gchar            *table_name,
+               const gchar            *id)
 {
   Table *table;
 
@@ -213,7 +213,7 @@ handle_lookup (XdgAppPermissionStore *object,
   data = flatpak_db_entry_get_data (entry);
   permissions = get_app_permissions (entry);
 
-  xdg_app_permission_store_complete_lookup (object, invocation,
+  flatpak_permission_store_complete_lookup (object, invocation,
                                             permissions,
                                             g_variant_new_variant (data));
 
@@ -221,10 +221,10 @@ handle_lookup (XdgAppPermissionStore *object,
 }
 
 static void
-emit_deleted (XdgAppPermissionStore *object,
-              const gchar           *table_name,
-              const gchar           *id,
-              FlatpakDbEntry        *entry)
+emit_deleted (FlatpakPermissionStore *object,
+              const gchar            *table_name,
+              const gchar            *id,
+              FlatpakDbEntry         *entry)
 {
   g_autoptr(GVariant) data = NULL;
   g_autoptr(GVariant) permissions = NULL;
@@ -232,7 +232,7 @@ emit_deleted (XdgAppPermissionStore *object,
   data = flatpak_db_entry_get_data (entry);
   permissions = g_variant_ref_sink (g_variant_new_array (G_VARIANT_TYPE ("{sas}"), NULL, 0));
 
-  xdg_app_permission_store_emit_changed (object,
+  flatpak_permission_store_emit_changed (object,
                                          table_name, id,
                                          TRUE,
                                          g_variant_new_variant (data),
@@ -241,10 +241,10 @@ emit_deleted (XdgAppPermissionStore *object,
 
 
 static void
-emit_changed (XdgAppPermissionStore *object,
-              const gchar           *table_name,
-              const gchar           *id,
-              FlatpakDbEntry        *entry)
+emit_changed (FlatpakPermissionStore *object,
+              const gchar            *table_name,
+              const gchar            *id,
+              FlatpakDbEntry         *entry)
 {
   g_autoptr(GVariant) data = NULL;
   g_autoptr(GVariant) permissions = NULL;
@@ -252,7 +252,7 @@ emit_changed (XdgAppPermissionStore *object,
   data = flatpak_db_entry_get_data (entry);
   permissions = get_app_permissions (entry);
 
-  xdg_app_permission_store_emit_changed (object,
+  flatpak_permission_store_emit_changed (object,
                                          table_name, id,
                                          FALSE,
                                          g_variant_new_variant (data),
@@ -260,10 +260,10 @@ emit_changed (XdgAppPermissionStore *object,
 }
 
 static gboolean
-handle_delete (XdgAppPermissionStore *object,
-               GDBusMethodInvocation *invocation,
-               const gchar           *table_name,
-               const gchar           *id)
+handle_delete (FlatpakPermissionStore *object,
+               GDBusMethodInvocation  *invocation,
+               const gchar            *table_name,
+               const gchar            *id)
 {
   Table *table;
 
@@ -291,13 +291,13 @@ handle_delete (XdgAppPermissionStore *object,
 }
 
 static gboolean
-handle_set (XdgAppPermissionStore *object,
-            GDBusMethodInvocation *invocation,
-            const gchar           *table_name,
-            gboolean               create,
-            const gchar           *id,
-            GVariant              *app_permissions,
-            GVariant              *data)
+handle_set (FlatpakPermissionStore *object,
+            GDBusMethodInvocation  *invocation,
+            const gchar            *table_name,
+            gboolean                create,
+            const gchar            *id,
+            GVariant               *app_permissions,
+            GVariant               *data)
 {
   Table *table;
   GVariantIter iter;
@@ -349,13 +349,13 @@ handle_set (XdgAppPermissionStore *object,
 }
 
 static gboolean
-handle_set_permission (XdgAppPermissionStore *object,
-                       GDBusMethodInvocation *invocation,
-                       const gchar           *table_name,
-                       gboolean               create,
-                       const gchar           *id,
-                       const gchar           *app,
-                       const gchar *const    *permissions)
+handle_set_permission (FlatpakPermissionStore *object,
+                       GDBusMethodInvocation  *invocation,
+                       const gchar            *table_name,
+                       gboolean                create,
+                       const gchar            *id,
+                       const gchar            *app,
+                       const gchar *const     *permissions)
 {
   Table *table;
 
@@ -392,12 +392,12 @@ handle_set_permission (XdgAppPermissionStore *object,
 }
 
 static gboolean
-handle_set_value (XdgAppPermissionStore *object,
-                  GDBusMethodInvocation *invocation,
-                  const gchar           *table_name,
-                  gboolean               create,
-                  const gchar           *id,
-                  GVariant              *data)
+handle_set_value (FlatpakPermissionStore *object,
+                  GDBusMethodInvocation  *invocation,
+                  const gchar            *table_name,
+                  gboolean                create,
+                  const gchar            *id,
+                  GVariant               *data)
 {
   Table *table;
 
@@ -439,13 +439,13 @@ handle_set_value (XdgAppPermissionStore *object,
 void
 flatpak_permission_store_start (GDBusConnection *connection)
 {
-  XdgAppPermissionStore *store;
+  FlatpakPermissionStore *store;
   GError *error = NULL;
 
   tables = g_hash_table_new_full (g_str_hash, g_str_equal,
                                   g_free, (GDestroyNotify) table_free);
 
-  store = xdg_app_permission_store_skeleton_new ();
+  store = flatpak_permission_store_skeleton_new ();
 
   g_signal_connect (store, "handle-list", G_CALLBACK (handle_list), NULL);
   g_signal_connect (store, "handle-lookup", G_CALLBACK (handle_lookup), NULL);
diff --git a/session-helper/flatpak-session-helper.c b/session-helper/flatpak-session-helper.c
index d9ba8b3..54ec63e 100644
--- a/session-helper/flatpak-session-helper.c
+++ b/session-helper/flatpak-session-helper.c
@@ -30,11 +30,11 @@
 static char *monitor_dir;
 
 static gboolean
-handle_request_monitor (XdgAppSessionHelper   *object,
+handle_request_monitor (FlatpakSessionHelper   *object,
                         GDBusMethodInvocation *invocation,
                         gpointer               user_data)
 {
-  xdg_app_session_helper_complete_request_monitor (object, invocation,
+  flatpak_session_helper_complete_request_monitor (object, invocation,
                                                    monitor_dir);
 
   return TRUE;
@@ -45,12 +45,12 @@ on_bus_acquired (GDBusConnection *connection,
                  const gchar     *name,
                  gpointer         user_data)
 {
-  XdgAppSessionHelper *helper;
+  FlatpakSessionHelper *helper;
   GError *error = NULL;
 
   flatpak_permission_store_start (connection);
 
-  helper = xdg_app_session_helper_skeleton_new ();
+  helper = flatpak_session_helper_skeleton_new ();
 
   g_signal_connect (helper, "handle-request-monitor", G_CALLBACK (handle_request_monitor), NULL);
 
@@ -134,7 +134,7 @@ main (int    argc,
 
   g_set_prgname (argv[0]);
 
-  monitor_dir = g_build_filename (g_get_user_runtime_dir (), "xdg-app-monitor", NULL);
+  monitor_dir = g_build_filename (g_get_user_runtime_dir (), "flatpak-monitor", NULL);
   if (g_mkdir_with_parents (monitor_dir, 0755) != 0)
     {
       g_print ("Can't create %s\n", monitor_dir);
diff --git a/session-helper/flatpak-session-helper.service.in b/session-helper/flatpak-session-helper.service.in
new file mode 100644
index 0000000..e14cc27
--- /dev/null
+++ b/session-helper/flatpak-session-helper.service.in
@@ -0,0 +1,7 @@
+[Unit]
+Description=flatpak session helper
+
+[Service]
+BusName=org.freedesktop.Flatpak
+ExecStart=@libexecdir@/flatpak-session-helper
+Type=dbus
diff --git a/session-helper/org.freedesktop.Flatpak.service.in b/session-helper/org.freedesktop.Flatpak.service.in
new file mode 100644
index 0000000..e02215e
--- /dev/null
+++ b/session-helper/org.freedesktop.Flatpak.service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.freedesktop.Flatpak
+Exec=@libexecdir@/flatpak-session-helper
+SystemdService=flatpak-session-helper.service
diff --git a/session-helper/org.freedesktop.XdgApp.service.in b/session-helper/org.freedesktop.XdgApp.service.in
deleted file mode 100644
index 3ad6f64..0000000
--- a/session-helper/org.freedesktop.XdgApp.service.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.XdgApp
-Exec=@libexecdir@/xdg-app-session-helper
-SystemdService=xdg-app-session-helper.service
diff --git a/session-helper/xdg-app-session-helper.service.in b/session-helper/xdg-app-session-helper.service.in
deleted file mode 100644
index 7279a3a..0000000
--- a/session-helper/xdg-app-session-helper.service.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=xdg-app session helper
-
-[Service]
-BusName=org.freedesktop.XdgApp
-ExecStart=@libexecdir@/xdg-app-session-helper
-Type=dbus
diff --git a/system-helper/Makefile.am.inc b/system-helper/Makefile.am.inc
index 7b34696..32cb7e7 100644
--- a/system-helper/Makefile.am.inc
+++ b/system-helper/Makefile.am.inc
@@ -1,34 +1,34 @@
 libexec_PROGRAMS += \
-	xdg-app-system-helper \
+	flatpak-system-helper \
 	$(NULL)
 
 dbussystemservicedir = $(datadir)/dbus-1/system-services
-service_in_files += system-helper/org.freedesktop.XdgApp.SystemHelper.service.in
-dbussystemservice_DATA = system-helper/org.freedesktop.XdgApp.SystemHelper.service
+service_in_files += system-helper/org.freedesktop.Flatpak.SystemHelper.service.in
+dbussystemservice_DATA = system-helper/org.freedesktop.Flatpak.SystemHelper.service
 
 dbusconfdir = ${sysconfdir}/dbus-1/system.d
-dbusconf_DATA = system-helper/org.freedesktop.XdgApp.SystemHelper.conf
+dbusconf_DATA = system-helper/org.freedesktop.Flatpak.SystemHelper.conf
 
-service_in_files += system-helper/xdg-app-system-helper.service.in
-systemdsystemunit_DATA = system-helper/xdg-app-system-helper.service
+service_in_files += system-helper/flatpak-system-helper.service.in
+systemdsystemunit_DATA = system-helper/flatpak-system-helper.service
 
-xdg_app_system_helper_SOURCES = \
+flatpak_system_helper_SOURCES = \
 	system-helper/flatpak-system-helper.c	\
 	lib/flatpak-error.c	\
 	$(NULL)
 
-xdg_app_system_helper_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(POLKIT_LIBS) libflatpak-common.la
-xdg_app_system_helper_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(POLKIT_CFLAGS)
+flatpak_system_helper_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(POLKIT_LIBS) libflatpak-common.la
+flatpak_system_helper_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(POLKIT_CFLAGS)
 
 polkit_rulesdir = $(datadir)/polkit-1/rules.d
 dist_polkit_rules_DATA =					\
-	system-helper/org.freedesktop.XdgApp.rules
+	system-helper/org.freedesktop.Flatpak.rules
 
 polkit_policydir = $(datadir)/polkit-1/actions
 dist_polkit_policy_DATA =					\
-	system-helper/org.freedesktop.XdgApp.policy
+	system-helper/org.freedesktop.Flatpak.policy
 
 @INTLTOOL_POLICY_RULE@
 
-EXTRA_DIST += system-helper/org.freedesktop.XdgApp.policy.in system-helper/org.freedesktop.XdgApp.SystemHelper.conf
-DISTCLEANFILES += system-helper/org.freedesktop.XdgApp.policy
+EXTRA_DIST += system-helper/org.freedesktop.Flatpak.policy.in system-helper/org.freedesktop.Flatpak.SystemHelper.conf
+DISTCLEANFILES += system-helper/org.freedesktop.Flatpak.policy
diff --git a/system-helper/flatpak-system-helper.c b/system-helper/flatpak-system-helper.c
index 44ce798..fd03ccb 100644
--- a/system-helper/flatpak-system-helper.c
+++ b/system-helper/flatpak-system-helper.c
@@ -43,7 +43,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (AutoPolkitDetails, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (AutoPolkitSubject, g_object_unref)
 
 static gboolean
-handle_deploy (XdgAppSystemHelper    *object,
+handle_deploy (FlatpakSystemHelper   *object,
                GDBusMethodInvocation *invocation,
                const gchar           *arg_repo_path,
                guint32                arg_flags,
@@ -155,7 +155,7 @@ handle_deploy (XdgAppSystemHelper    *object,
         }
     }
 
-  xdg_app_system_helper_complete_deploy (object, invocation);
+  flatpak_system_helper_complete_deploy (object, invocation);
 
   return TRUE;
 }
@@ -249,10 +249,10 @@ on_bus_acquired (GDBusConnection *connection,
                  const gchar     *name,
                  gpointer         user_data)
 {
-  XdgAppSystemHelper *helper;
+  FlatpakSystemHelper *helper;
   GError *error = NULL;
 
-  helper = xdg_app_system_helper_skeleton_new ();
+  helper = flatpak_system_helper_skeleton_new ();
 
   g_dbus_interface_skeleton_set_flags (G_DBUS_INTERFACE_SKELETON (helper),
                                        G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD);
diff --git a/system-helper/flatpak-system-helper.service.in b/system-helper/flatpak-system-helper.service.in
new file mode 100644
index 0000000..7c7cf67
--- /dev/null
+++ b/system-helper/flatpak-system-helper.service.in
@@ -0,0 +1,7 @@
+[Unit]
+Description=flatpak system helper
+
+[Service]
+BusName=org.freedesktop.Flatpak.SystemHelper
+ExecStart=@libexecdir@/flatpak-system-helper
+Type=dbus
diff --git a/system-helper/org.freedesktop.XdgApp.SystemHelper.conf b/system-helper/org.freedesktop.Flatpak.SystemHelper.conf
index 6b6a646..4aac5b8 100644
--- a/system-helper/org.freedesktop.XdgApp.SystemHelper.conf
+++ b/system-helper/org.freedesktop.Flatpak.SystemHelper.conf
@@ -6,19 +6,19 @@
 <busconfig>
 
   <!-- This configuration file specifies the required security policies
-       for the the xdg-app system helper to work. -->
+       for the the flatpak system helper to work. -->
 
   <policy user="root">
-    <allow own="org.freedesktop.XdgApp.SystemHelper"/>
+    <allow own="org.freedesktop.Flatpak.SystemHelper"/>
   </policy>
 
  <!-- Allow anyone to call into the service - we'll reject callers using PolicyKit -->
   <policy context="default">
-    <allow send_destination="org.freedesktop.XdgApp.SystemHelper"
-           send_interface="org.freedesktop.XdgApp.SystemHelper"/>
-    <allow send_destination="org.freedesktop.XdgApp.SystemHelper"
+    <allow send_destination="org.freedesktop.Flatpak.SystemHelper"
+           send_interface="org.freedesktop.Flatpak.SystemHelper"/>
+    <allow send_destination="org.freedesktop.Flatpak.SystemHelper"
            send_interface="org.freedesktop.DBus.Introspectable"/>
-    <allow send_destination="org.freedesktop.ColorManager"
+    <allow send_destination="org.freedesktop.Flatpak.SystemHelper"
            send_interface="org.freedesktop.DBus.Peer"/>
   </policy>
 
diff --git a/system-helper/org.freedesktop.Flatpak.SystemHelper.service.in b/system-helper/org.freedesktop.Flatpak.SystemHelper.service.in
new file mode 100644
index 0000000..4e9293a
--- /dev/null
+++ b/system-helper/org.freedesktop.Flatpak.SystemHelper.service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.freedesktop.Flatpak.SystemHelper
+Exec=@libexecdir@/flatpak-system-helper
+SystemdService=flatpak-system-helper.service
diff --git a/system-helper/org.freedesktop.XdgApp.policy.in b/system-helper/org.freedesktop.Flatpak.policy.in
index f5f2272..a420339 100644
--- a/system-helper/org.freedesktop.XdgApp.policy.in
+++ b/system-helper/org.freedesktop.Flatpak.policy.in
@@ -5,15 +5,15 @@
 <policyconfig>
 
   <!--
-    Policy definitions for XdgApp system actions.
+    Policy definitions for Flatpak system actions.
     Copyright (c) 2016 Alexander Larsson <alexl@redhat.com>
   -->
 
-  <vendor>The XdgApp Project</vendor>
+  <vendor>The Flatpak Project</vendor>
   <vendor_url>https://cgit.freedesktop.org/xdg-app/xdg-app/</vendor_url>
   <icon_name>package-x-generic</icon_name>
 
-  <action id="org.freedesktop.XdgApp.app-install">
+  <action id="org.freedesktop.Flatpak.app-install">
     <!-- SECURITY:
           - Normal users do not need authentication to install signed applications
             from signed repositories, as this cannot exploit a system.
@@ -30,7 +30,7 @@
     </defaults>
   </action>
 
-  <action id="org.freedesktop.XdgApp.runtime-install">
+  <action id="org.freedesktop.Flatpak.runtime-install">
     <!-- SECURITY:
           - Normal users do not need authentication to install signed applications
             from signed repositories, as this cannot exploit a system.
@@ -47,7 +47,7 @@
     </defaults>
   </action>
 
-  <action id="org.freedesktop.XdgApp.app-update">
+  <action id="org.freedesktop.Flatpak.app-update">
     <!-- SECURITY:
           - Normal users do not require admin authentication to update an
             app as the commit will be signed, and the action is required
@@ -65,7 +65,7 @@
     </defaults>
   </action>
 
-  <action id="org.freedesktop.XdgApp.runtime-update">
+  <action id="org.freedesktop.Flatpak.runtime-update">
     <!-- SECURITY:
           - Normal users do not require admin authentication to update a
             runtime as the commit will be signed, and the action is required
diff --git a/system-helper/org.freedesktop.XdgApp.rules b/system-helper/org.freedesktop.Flatpak.rules
index 113306b..c1ce8ee 100644
--- a/system-helper/org.freedesktop.XdgApp.rules
+++ b/system-helper/org.freedesktop.Flatpak.rules
@@ -1,6 +1,6 @@
 polkit.addRule(function(action, subject) {
-    if ((action.id == "org.freedesktop.XdgApp.app-install" ||
-         action.id == "org.freedesktop.XdgApp.runtime-install") &&
+    if ((action.id == "org.freedesktop.Flatpak.app-install" ||
+         action.id == "org.freedesktop.Flatpak.runtime-install") &&
         subject.active == true && subject.local == true &&
         subject.isInGroup("wheel")) {
             return polkit.Result.YES;
diff --git a/system-helper/org.freedesktop.XdgApp.SystemHelper.service.in b/system-helper/org.freedesktop.XdgApp.SystemHelper.service.in
deleted file mode 100644
index c6ef627..0000000
--- a/system-helper/org.freedesktop.XdgApp.SystemHelper.service.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.XdgApp.SystemHelper
-Exec=@libexecdir@/xdg-app-system-helper
-SystemdService=xdg-app-system-helper.service
diff --git a/system-helper/xdg-app-system-helper.service.in b/system-helper/xdg-app-system-helper.service.in
deleted file mode 100644
index 5f1e6ce..0000000
--- a/system-helper/xdg-app-system-helper.service.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=xdg-app system helper
-
-[Service]
-BusName=org.freedesktop.XdgApp.SystemHelper
-ExecStart=@libexecdir@/xdg-app-system-helper
-Type=dbus
diff --git a/tests/Makefile.am.inc b/tests/Makefile.am.inc
index c9ef3f1..dc30509 100644
--- a/tests/Makefile.am.inc
+++ b/tests/Makefile.am.inc
@@ -1,7 +1,7 @@
 TESTS_ENVIRONMENT += OT_TESTS_DEBUG=1 \
 	FLATPAK_TRIGGERSDIR=$$(cd $(top_srcdir) && pwd)/triggers \
 	FLATPAK_BWRAP=$$(cd $(top_builddir) && pwd)/bwrap \
-	FLATPAK_DBUSPROXY=$$(cd $(top_builddir) && pwd)/xdg-dbus-proxy \
+	FLATPAK_DBUSPROXY=$$(cd $(top_builddir) && pwd)/flatpak-dbus-proxy \
 	GI_TYPELIB_PATH=$$(cd $(top_builddir) && pwd) \
 	LD_LIBRARY_PATH=$$(cd $(top_builddir)/.libs && pwd) \
 	PATH=$$(cd $(top_builddir) && pwd):$${PATH} \
@@ -25,22 +25,22 @@ test_doc_portal_LDADD = \
              $(NULL)
 test_doc_portal_SOURCES = tests/test-doc-portal.c $(xdp_dbus_built_sources)
 
-EXTRA_test_doc_portal_DEPENDENCIES = tests/services/org.freedesktop.portal.Documents.service  tests/services/org.freedesktop.XdgApp.service
+EXTRA_test_doc_portal_DEPENDENCIES = tests/services/org.freedesktop.portal.Documents.service  tests/services/org.freedesktop.Flatpak.service
 
 tests/services/org.freedesktop.portal.Documents.service: document-portal/org.freedesktop.portal.Documents.service.in
 	mkdir -p tests/services
 	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)|" $< > $@
 
-tests/services/org.freedesktop.XdgApp.service: session-helper/org.freedesktop.XdgApp.service.in
+tests/services/org.freedesktop.Flatpak.service: session-helper/org.freedesktop.Flatpak.service.in
 	mkdir -p tests/services
 	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)|" $< > $@
 
-tests/libtest.sh: tests/services/org.freedesktop.portal.Documents.service  tests/services/org.freedesktop.XdgApp.service
+tests/libtest.sh: tests/services/org.freedesktop.portal.Documents.service  tests/services/org.freedesktop.Flatpak.service
 
 install-test-data-hook:
 if ENABLE_INSTALLED_TESTS
 	mkdir -p $(DESTDIR)$(installed_testdir)/services
-	ln -sf $(dbus_servicedir)/org.freedesktop.XdgApp.service $(DESTDIR)$(installed_testdir)/services/
+	ln -sf $(dbus_servicedir)/org.freedesktop.Flatpak.service $(DESTDIR)$(installed_testdir)/services/
 	ln -sf $(dbus_servicedir)/org.freedesktop.portal.Documents.service $(DESTDIR)$(installed_testdir)/services/
 endif
 
@@ -76,9 +76,9 @@ test_scripts = \
 test_programs = testdb test-doc-portal
 
 @VALGRIND_CHECK_RULES@
-VALGRIND_SUPPRESSIONS_FILES=tests/xdg-app.supp
-EXTRA_DIST += tests/xdg-app.supp tests/dbs/no_tables
+VALGRIND_SUPPRESSIONS_FILES=tests/flatpak-valgrind.supp
+EXTRA_DIST += tests/flatpak-valgrind.supp tests/dbs/no_tables
 CLEANFILES += \
-	tests/services/org.freedesktop.XdgApp.service \
+	tests/services/org.freedesktop.Flatpak.service \
 	tests/services/org.freedesktop.portal.Documents.service \
 	$(NULL)
diff --git a/tests/xdg-app-valgrind.supp b/tests/flatpak-valgrind.supp
index 00efd87..00efd87 100644
--- a/tests/xdg-app-valgrind.supp
+++ b/tests/flatpak-valgrind.supp
diff --git a/tests/libtest.sh b/tests/libtest.sh
index 63800ff..3867d9e 100644
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
@@ -62,20 +62,20 @@ if test -n "${OT_TESTS_DEBUG:-}"; then
 fi
 
 if test -n "${OT_TESTS_VALGRIND:-}"; then
-    CMD_PREFIX="env G_SLICE=always-malloc valgrind -q --leak-check=full --num-callers=30 --suppressions=${test_srcdir}/xdg-app-valgrind.supp"
+    CMD_PREFIX="env G_SLICE=always-malloc valgrind -q --leak-check=full --num-callers=30 --suppressions=${test_srcdir}/flatpak-valgrind.supp"
 else
     CMD_PREFIX=""
 fi
 
 # We need this to be in /var/tmp because /tmp has no xattr support
-TEST_DATA_DIR=`mktemp -d /var/tmp/test-xdg-app-XXXXXX`
+TEST_DATA_DIR=`mktemp -d /var/tmp/test-flatpak-XXXXXX`
 
 export XDG_DATA_HOME=${TEST_DATA_DIR}/share
 
 export USERDIR=${TEST_DATA_DIR}/share/xdg-app
-export ARCH=`xdg-app --default-arch`
+export ARCH=`flatpak --default-arch`
 
-export XDG_APP="${CMD_PREFIX} xdg-app"
+export FLATPAK="${CMD_PREFIX} flatpak"
 
 assert_streq () {
     test "$1" = "$2" || (echo 1>&2 "$1 != $2"; exit 1)
@@ -146,7 +146,7 @@ assert_file_empty() {
 setup_repo () {
     . $(dirname $0)/make-test-runtime.sh org.test.Platform bash ls cat echo readlink > /dev/null
     . $(dirname $0)/make-test-app.sh > /dev/null
-    xdg-app remote-add --user --no-gpg-verify test-repo repo
+    flatpak remote-add --user --no-gpg-verify test-repo repo
 }
 
 setup_sdk_repo () {
@@ -155,21 +155,21 @@ setup_sdk_repo () {
 
 
 install_repo () {
-    ${XDG_APP} --user install test-repo org.test.Platform master
-    ${XDG_APP} --user install test-repo org.test.Hello master
+    ${FLATPAK} --user install test-repo org.test.Platform master
+    ${FLATPAK} --user install test-repo org.test.Hello master
 }
 
 install_sdk_repo () {
-    ${XDG_APP} --user install test-repo org.test.Sdk master
+    ${FLATPAK} --user install test-repo org.test.Sdk master
 }
 
 run () {
-    ${CMD_PREFIX} xdg-app run "$@"
+    ${CMD_PREFIX} flatpak run "$@"
 
 }
 
 run_sh () {
-    ${CMD_PREFIX} xdg-app run --command=bash ${ARGS-} org.test.Hello -c "$*"
+    ${CMD_PREFIX} flatpak run --command=bash ${ARGS-} org.test.Hello -c "$*"
 }
 
 sed s#@testdir@#${test_builddir}# ${test_srcdir}/session.conf.in > session.conf
diff --git a/tests/make-test-app.sh b/tests/make-test-app.sh
index 20683e4..e0f927e 100755
--- a/tests/make-test-app.sh
+++ b/tests/make-test-app.sh
@@ -5,7 +5,7 @@ set -e
 DIR=`mktemp -d`
 
 # Init dir
-xdg-app build-init ${DIR} org.test.Hello org.test.Platform org.test.Platform
+flatpak build-init ${DIR} org.test.Hello org.test.Platform org.test.Platform
 
 mkdir -p ${DIR}/files/bin
 cat > ${DIR}/files/bin/hello.sh <<EOF
@@ -29,7 +29,7 @@ cp $(dirname $0)/org.test.Hello.png ${DIR}/files/share/icons/hicolor/64x64/apps/
 
 
 mkdir -p ${DIR}/files/share/app-info/xmls
-mkdir -p ${DIR}/files/share/app-info/icons/xdg-app/64x64
+mkdir -p ${DIR}/files/share/app-info/icons/flatpak/64x64
 gzip -c > ${DIR}/files/share/app-info/xmls/org.test.Hello.xml.gz <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <components version="0.8">
@@ -45,8 +45,8 @@ gzip -c > ${DIR}/files/share/app-info/xmls/org.test.Hello.xml.gz <<EOF
   </component>
 </components>
 EOF
-cp $(dirname $0)/org.test.Hello.png ${DIR}/files/share/app-info/icons/xdg-app/64x64/
+cp $(dirname $0)/org.test.Hello.png ${DIR}/files/share/app-info/icons/flatpak/64x64/
 
-xdg-app build-finish --command=hello.sh ${DIR}
-xdg-app build-export repo ${DIR}
+flatpak build-finish --command=hello.sh ${DIR}
+flatpak build-export repo ${DIR}
 rm -rf ${DIR}
diff --git a/tests/make-test-bundles.sh b/tests/make-test-bundles.sh
index 3bdc5ce..ea135e9 100755
--- a/tests/make-test-bundles.sh
+++ b/tests/make-test-bundles.sh
@@ -9,18 +9,18 @@ URL=file://`pwd`/repo
 
 REF=`(cd repo/refs/heads; echo app/org.test.Hello/*/master)`
 
-xdg-app build-bundle repo hello.xdgapp org.test.Hello
-xdg-app build-bundle repo hello-key.xdgapp --gpg-keys=test-keyring/pubring.gpg org.test.Hello
-xdg-app build-bundle repo --repo-url=${URL} hello-origin.xdgapp org.test.Hello
-xdg-app build-bundle repo --repo-url=${URL} --gpg-keys=test-keyring/pubring.gpg hello-key-origin.xdgapp org.test.Hello
+flatpak build-bundle repo hello.pak org.test.Hello
+flatpak build-bundle repo hello-key.pak --gpg-keys=test-keyring/pubring.gpg org.test.Hello
+flatpak build-bundle repo --repo-url=${URL} hello-origin.pak org.test.Hello
+flatpak build-bundle repo --repo-url=${URL} --gpg-keys=test-keyring/pubring.gpg hello-key-origin.pak org.test.Hello
 
 ostree gpg-sign --repo=repo --gpg-homedir=test-keyring ${REF} 7B0961FD
 
-xdg-app build-bundle repo hello-signed.xdgapp org.test.Hello
-xdg-app build-bundle repo hello-key-signed.xdgapp --gpg-keys=test-keyring/pubring.gpg org.test.Hello
-xdg-app build-bundle repo --repo-url=${URL} hello-origin-signed.xdgapp org.test.Hello
-xdg-app build-bundle repo --repo-url=${URL} --gpg-keys=test-keyring/pubring.gpg hello-key-origin-signed.xdgapp org.test.Hello
+flatpak build-bundle repo hello-signed.pak org.test.Hello
+flatpak build-bundle repo hello-key-signed.pak --gpg-keys=test-keyring/pubring.gpg org.test.Hello
+flatpak build-bundle repo --repo-url=${URL} hello-origin-signed.pak org.test.Hello
+flatpak build-bundle repo --repo-url=${URL} --gpg-keys=test-keyring/pubring.gpg hello-key-origin-signed.pak org.test.Hello
 
 REF=`(cd repo/refs/heads; echo runtime/org.test.Platform/*/master)`
 ostree gpg-sign --repo=repo --gpg-homedir=test-keyring ${REF} 7B0961FD
-xdg-app build-bundle --runtime repo --repo-url=${URL} --gpg-keys=test-keyring/pubring.gpg platform.xdgapp org.test.Platform
+flatpak build-bundle --runtime repo --repo-url=${URL} --gpg-keys=test-keyring/pubring.gpg platform.pak org.test.Platform
diff --git a/tests/make-test-runtime.sh b/tests/make-test-runtime.sh
index 631af63..15896f6 100755
--- a/tests/make-test-runtime.sh
+++ b/tests/make-test-runtime.sh
@@ -7,7 +7,7 @@ DIR=`mktemp -d`
 ID=$1
 shift
 
-xdg-app build-init ${DIR} ${ID} ${ID} ${ID}
+flatpak build-init ${DIR} ${ID} ${ID} ${ID}
 sed -i s/Application/Runtime/ ${DIR}/metadata
 
 # Add bash and dependencies
@@ -26,5 +26,5 @@ for i in `sort -u $T`; do
     cp "$i" ${DIR}/usr/lib/
 done
 
-xdg-app build-export --runtime repo ${DIR}
+flatpak build-export --runtime repo ${DIR}
 rm -rf ${DIR}
diff --git a/tests/test-basic.sh b/tests/test-basic.sh
index fc88a12..e074828 100755
--- a/tests/test-basic.sh
+++ b/tests/test-basic.sh
@@ -23,19 +23,19 @@ set -euo pipefail
 
 echo "1..3"
 
-${XDG_APP} --version > version_out
+${FLATPAK} --version > version_out
 
 VERSION=`cat $(dirname $0)/package_version.txt`
 assert_file_has_content version_out "^flatpak $VERSION$"
 
 echo "ok version"
 
-${XDG_APP} --help > help_out
+${FLATPAK} --help > help_out
 
 assert_file_has_content help_out "^Usage:$"
 
 echo "ok help"
 
-${XDG_APP} --default-arch > /dev/null
+${FLATPAK} --default-arch > /dev/null
 
 echo "ok default arch"
diff --git a/tests/test-builder.sh b/tests/test-builder.sh
index 1ac4758..dcbe586 100755
--- a/tests/test-builder.sh
+++ b/tests/test-builder.sh
@@ -35,7 +35,7 @@ cd $TEST_DATA_DIR/
 cp -a $(dirname $0)/test-configure .
 echo "version1" > app-data
 cp $(dirname $0)/test.json .
-xdg-app-builder --repo=$REPO --force-clean appdir test.json > /dev/null
+flatpak-builder --repo=$REPO --force-clean appdir test.json > /dev/null
 
 assert_file_has_content appdir/files/share/app-data version1
 assert_file_has_content appdir/metadata shared=network;
@@ -46,12 +46,12 @@ assert_not_has_file appdir/files/bin/file.cleanup
 
 assert_has_file appdir/files/cleaned_up > out
 
-${XDG_APP} build appdir /app/bin/hello2.sh > hello_out2
+${FLATPAK} build appdir /app/bin/hello2.sh > hello_out2
 assert_file_has_content hello_out2 '^Hello world2, from a sandbox$'
 
 echo "ok build"
 
-${XDG_APP} --user install test-repo org.test.Hello2 master
+${FLATPAK} --user install test-repo org.test.Hello2 master
 run org.test.Hello2 > hello_out3
 assert_file_has_content hello_out3 '^Hello world2, from a sandbox$'
 
@@ -61,10 +61,10 @@ assert_file_has_content app_data_1 version1
 echo "ok install+run"
 
 echo "version2" > app-data
-xdg-app-builder --repo=$REPO --force-clean appdir test.json > /dev/null
+flatpak-builder --repo=$REPO --force-clean appdir test.json > /dev/null
 assert_file_has_content appdir/files/share/app-data version2
 
-${XDG_APP} --user update org.test.Hello2 master
+${FLATPAK} --user update org.test.Hello2 master
 
 run --command=cat org.test.Hello2 /app/share/app-data > app_data_2
 assert_file_has_content app_data_2 version2
diff --git a/tests/test-run.sh b/tests/test-run.sh
index 493b844..c10912a 100755
--- a/tests/test-run.sh
+++ b/tests/test-run.sh
@@ -40,7 +40,7 @@ assert_has_dir $USERDIR/app/org.test.Hello/$ARCH/master/active/files
 assert_has_dir $USERDIR/app/org.test.Hello/$ARCH/master/active/export
 assert_has_file $USERDIR/exports/share/applications/org.test.Hello.desktop
 # Ensure Exec key is rewritten
-assert_file_has_content $USERDIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/xdg-app run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$"
+assert_file_has_content $USERDIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$"
 assert_has_file $USERDIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png
 
 # Ensure triggers ran
@@ -49,14 +49,14 @@ assert_file_has_content $USERDIR/exports/share/applications/mimeinfo.cache x-tes
 assert_has_file $USERDIR/exports/share/icons/hicolor/icon-theme.cache
 assert_has_file $USERDIR/exports/share/icons/hicolor/index.theme
 
-$XDG_APP list --user | grep org.test.Hello > /dev/null
-$XDG_APP list --user -d | grep org.test.Hello | grep test-repo > /dev/null
-$XDG_APP list --user -d | grep org.test.Hello | grep current > /dev/null
-$XDG_APP list --user -d | grep org.test.Hello | grep ${ID:0:12} > /dev/null
+$FLATPAK list --user | grep org.test.Hello > /dev/null
+$FLATPAK list --user -d | grep org.test.Hello | grep test-repo > /dev/null
+$FLATPAK list --user -d | grep org.test.Hello | grep current > /dev/null
+$FLATPAK list --user -d | grep org.test.Hello | grep ${ID:0:12} > /dev/null
 
-$XDG_APP info --user org.test.Hello > /dev/null
-$XDG_APP info --user org.test.Hello | grep test-repo > /dev/null
-$XDG_APP info --user org.test.Hello | grep $ID > /dev/null
+$FLATPAK info --user org.test.Hello > /dev/null
+$FLATPAK info --user org.test.Hello | grep test-repo > /dev/null
+$FLATPAK info --user org.test.Hello | grep $ID > /dev/null
 
 echo "ok install"
 
@@ -65,10 +65,10 @@ assert_file_has_content hello_out '^Hello world, from a sandbox$'
 
 echo "ok hello"
 
-run_sh cat /run/user/`id -u`/xdg-app-info > xai
-assert_file_has_content xai '^name=org.test.Hello$'
+run_sh cat /run/user/`id -u`/flatpak-info > fpi
+assert_file_has_content fpi '^name=org.test.Hello$'
 
-echo "ok xdg-app-info"
+echo "ok flatpak-info"
 
 run_sh readlink /proc/self/ns/net > unshared_net_ns
 ARGS="--share=network" run_sh readlink /proc/self/ns/net > shared_net_ns
@@ -89,12 +89,12 @@ ARGS="--filesystem=host" run_sh cat $(dirname $0)/package_version.txt > /dev/nul
 
 echo "ok namespaces"
 
-$XDG_APP override --user --filesystem=host org.test.Hello
+$FLATPAK override --user --filesystem=host org.test.Hello
 run_sh cat $(dirname $0)/package_version.txt &> /dev/null
 if ARGS="--nofilesystem=host" run_sh cat $(dirname $0)/package_version.txt &> /dev/null; then
     assert_not_reached "Unexpectedly allowed to access --nofilesystem=host file"
 fi
-$XDG_APP override --user --nofilesystem=host org.test.Hello
+$FLATPAK override --user --nofilesystem=host org.test.Hello
 
 if run_sh cat $(dirname $0)/package_version.txt &> /dev/null; then
     assert_not_reached "Unexpectedly allowed to access file"
diff --git a/tests/xdg-app.supp b/tests/xdg-app.supp
deleted file mode 100644
index 05722a9..0000000
--- a/tests/xdg-app.supp
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-   glib _dl_init
-   Memcheck:Leak
-   fun:*alloc
-   ...
-   fun:_dl_init
-}
-
-{
-   glib _static_types
-   Memcheck:Leak
-   fun:*alloc
-   ...
-   fun:g_type_register_static
-}
-
-{
-   glib _static_typ
-   Memcheck:Leak
-   fun:calloc
-   fun:g_malloc0
-   fun:type_class_init_Wm
-}
-
-{
-   gio dbus worker thread
-   Memcheck:Leak
-   fun:calloc
-   ...
-   fun:_g_dbus_worker_new
-}