Rename everything but the on-disk location to flatpak

28 files changed, 347 insertions, 347 deletions

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@