Rename source files to flatpak

94 files changed, 260 insertions, 260 deletions

diff --git a/app/Makefile.am.inc b/app/Makefile.am.inc
index 853a8da..d8f7ddf 100644
--- a/app/Makefile.am.inc
+++ b/app/Makefile.am.inc
@@ -3,30 +3,30 @@ bin_PROGRAMS += \
 	$(NULL)
 
 xdg_app_SOURCES = \
-	app/xdg-app-main.c \
-	app/xdg-app-builtins.h \
-	app/xdg-app-builtins-add-remote.c \
-	app/xdg-app-builtins-delete-remote.c \
-	app/xdg-app-builtins-list-remotes.c \
-	app/xdg-app-builtins-ls-remote.c \
-	app/xdg-app-builtins-install.c \
-	app/xdg-app-builtins-override.c \
-	app/xdg-app-builtins-make-current.c \
-	app/xdg-app-builtins-update.c \
-	app/xdg-app-builtins-uninstall.c \
-	app/xdg-app-builtins-list.c \
-	app/xdg-app-builtins-info.c \
-	app/xdg-app-builtins-run.c \
-	app/xdg-app-builtins-enter.c \
-	app/xdg-app-builtins-build-init.c \
-	app/xdg-app-builtins-build.c \
-	app/xdg-app-builtins-build-finish.c \
-	app/xdg-app-builtins-build-export.c \
-	app/xdg-app-builtins-build-bundle.c \
-	app/xdg-app-builtins-build-import-bundle.c \
-	app/xdg-app-builtins-build-sign.c \
-	app/xdg-app-builtins-repo-update.c \
-	app/xdg-app-builtins-document.c \
+	app/flatpak-main.c \
+	app/flatpak-builtins.h \
+	app/flatpak-builtins-add-remote.c \
+	app/flatpak-builtins-delete-remote.c \
+	app/flatpak-builtins-list-remotes.c \
+	app/flatpak-builtins-ls-remote.c \
+	app/flatpak-builtins-install.c \
+	app/flatpak-builtins-override.c \
+	app/flatpak-builtins-make-current.c \
+	app/flatpak-builtins-update.c \
+	app/flatpak-builtins-uninstall.c \
+	app/flatpak-builtins-list.c \
+	app/flatpak-builtins-info.c \
+	app/flatpak-builtins-run.c \
+	app/flatpak-builtins-enter.c \
+	app/flatpak-builtins-build-init.c \
+	app/flatpak-builtins-build.c \
+	app/flatpak-builtins-build-finish.c \
+	app/flatpak-builtins-build-export.c \
+	app/flatpak-builtins-build-bundle.c \
+	app/flatpak-builtins-build-import-bundle.c \
+	app/flatpak-builtins-build-sign.c \
+	app/flatpak-builtins-repo-update.c \
+	app/flatpak-builtins-document.c \
 	$(xdp_dbus_built_sources)	\
 	$(NULL)
 
diff --git a/app/xdg-app-builtins-add-remote.c b/app/flatpak-builtins-add-remote.c
index 5627adb..ad7dabd 100644
--- a/app/xdg-app-builtins-add-remote.c
+++ b/app/flatpak-builtins-add-remote.c
@@ -30,9 +30,9 @@
 #include "libgsystem.h"
 #include "libglnx/libglnx.h"
 
-#include "xdg-app-builtins.h"
-#include "xdg-app-utils.h"
-#include "xdg-app-chain-input-stream.h"
+#include "flatpak-builtins.h"
+#include "flatpak-utils.h"
+#include "flatpak-chain-input-stream.h"
 
 static gboolean opt_no_gpg_verify;
 static gboolean opt_do_gpg_verify;
diff --git a/app/xdg-app-builtins-build-bundle.c b/app/flatpak-builtins-build-bundle.c
index 9f7270d..bdc7e9e 100644
--- a/app/xdg-app-builtins-build-bundle.c
+++ b/app/flatpak-builtins-build-bundle.c
@@ -30,9 +30,9 @@
 #include "libgsystem.h"
 #include "libglnx/libglnx.h"
 
-#include "xdg-app-builtins.h"
-#include "xdg-app-utils.h"
-#include "xdg-app-chain-input-stream.h"
+#include "flatpak-builtins.h"
+#include "flatpak-utils.h"
+#include "flatpak-chain-input-stream.h"
 
 #ifdef HAVE_LIBARCHIVE
 #include <archive.h>
diff --git a/app/xdg-app-builtins-build-export.c b/app/flatpak-builtins-build-export.c
index a6f7899..a4f7c3d 100644
--- a/app/xdg-app-builtins-build-export.c
+++ b/app/flatpak-builtins-build-export.c
@@ -28,8 +28,8 @@
 #include "libgsystem.h"
 #include "libglnx/libglnx.h"
 
-#include "xdg-app-builtins.h"
-#include "xdg-app-utils.h"
+#include "flatpak-builtins.h"
+#include "flatpak-utils.h"
 
 static char *opt_subject;
 static char *opt_body;
diff --git a/app/xdg-app-builtins-build-finish.c b/app/flatpak-builtins-build-finish.c
index a46eecd..9038d07 100644
--- a/app/xdg-app-builtins-build-finish.c
+++ b/app/flatpak-builtins-build-finish.c
@@ -29,9 +29,9 @@
 #include "libgsystem.h"
 #include "libglnx/libglnx.h"
 
-#include "xdg-app-builtins.h"
-#include "xdg-app-utils.h"
-#include "xdg-app-run.h"
+#include "flatpak-builtins.h"
+#include "flatpak-utils.h"
+#include "flatpak-run.h"
 
 static char *opt_command;
 static gboolean opt_no_exports;
diff --git a/app/xdg-app-builtins-build-import-bundle.c b/app/flatpak-builtins-build-import-bundle.c
index ac0a939..5312a89 100644
--- a/app/xdg-app-builtins-build-import-bundle.c
+++ b/app/flatpak-builtins-build-import-bundle.c
@@ -28,8 +28,8 @@
 #include "libgsystem.h"
 #include "libglnx/libglnx.h"
 
-#include "xdg-app-builtins.h"
-#include "xdg-app-utils.h"
+#include "flatpak-builtins.h"
+#include "flatpak-utils.h"
 
 static char *opt_ref;
 static gboolean opt_oci = FALSE;
diff --git a/app/xdg-app-builtins-build-init.c b/app/flatpak-builtins-build-init.c
index c100d33..ed34ba1 100644
--- a/app/xdg-app-builtins-build-init.c
+++ b/app/flatpak-builtins-build-init.c
@@ -28,8 +28,8 @@
 #include "libgsystem.h"
 #include "libglnx/libglnx.h"
 
-#include "xdg-app-builtins.h"
-#include "xdg-app-utils.h"
+#include "flatpak-builtins.h"
+#include "flatpak-utils.h"
 
 static char *opt_arch;
 static char *opt_var;
diff --git a/app/xdg-app-builtins-build-sign.c b/app/flatpak-builtins-build-sign.c
index 4c8c887..702580f 100644
--- a/app/xdg-app-builtins-build-sign.c
+++ b/app/flatpak-builtins-build-sign.c
@@ -28,8 +28,8 @@
 #include "libgsystem.h"
 #include "libglnx/libglnx.h"
 
-#include "xdg-app-builtins.h"
-#include "xdg-app-utils.h"
+#include "flatpak-builtins.h"
+#include "flatpak-utils.h"
 
 static char *opt_arch;
 static gboolean opt_runtime;
diff --git a/app/xdg-app-builtins-build.c b/app/flatpak-builtins-build.c
index 82416e2..6fa20d2 100644
--- a/app/xdg-app-builtins-build.c
+++ b/app/flatpak-builtins-build.c
@@ -29,9 +29,9 @@
 #include "libgsystem.h"
 #include "libglnx/libglnx.h"
 
-#include "xdg-app-builtins.h"
-#include "xdg-app-utils.h"
-#include "xdg-app-run.h"
+#include "flatpak-builtins.h"
+#include "flatpak-utils.h"
+#include "flatpak-run.h"
 
 static gboolean opt_runtime;
 static char *opt_build_dir;
diff --git a/app/xdg-app-builtins-delete-remote.c b/app/flatpak-builtins-delete-remote.c
index 2f24b48..48330cd 100644
--- a/app/xdg-app-builtins-delete-remote.c
+++ b/app/flatpak-builtins-delete-remote.c
@@ -28,7 +28,7 @@
 #include "libgsystem.h"
 #include "libglnx/libglnx.h"
 
-#include "xdg-app-builtins.h"
+#include "flatpak-builtins.h"
 
 gboolean
 flatpak_builtin_delete_remote (int argc, char **argv, GCancellable *cancellable, GError **error)
diff --git a/app/xdg-app-builtins-document.c b/app/flatpak-builtins-document.c
index 893adee..e636061 100644
--- a/app/xdg-app-builtins-document.c
+++ b/app/flatpak-builtins-document.c
@@ -32,9 +32,9 @@
 
 #include <gio/gunixfdlist.h>
 
-#include "xdg-app-builtins.h"
-#include "xdg-app-utils.h"
-#include "xdg-app-run.h"
+#include "flatpak-builtins.h"
+#include "flatpak-utils.h"
+#include "flatpak-run.h"
 
 gboolean opt_unique = FALSE;
 gboolean opt_allow_write = FALSE;
diff --git a/app/xdg-app-builtins-enter.c b/app/flatpak-builtins-enter.c
index 162195e..3b3aa64 100644
--- a/app/xdg-app-builtins-enter.c
+++ b/app/flatpak-builtins-enter.c
@@ -30,10 +30,10 @@
 #include "libgsystem.h"
 #include "libglnx/libglnx.h"
 
-#include "xdg-app-builtins.h"
-#include "xdg-app-utils.h"
-#include "xdg-app-dbus.h"
-#include "xdg-app-run.h"
+#include "flatpak-builtins.h"
+#include "flatpak-utils.h"
+#include "flatpak-dbus.h"
+#include "flatpak-run.h"
 
 
 static GOptionEntry options[] = {
diff --git a/app/xdg-app-builtins-info.c b/app/flatpak-builtins-info.c
index 2b60ebf..0c5c5d9 100644
--- a/app/xdg-app-builtins-info.c
+++ b/app/flatpak-builtins-info.c
@@ -28,8 +28,8 @@
 #include "libgsystem.h"
 #include "libglnx/libglnx.h"
 
-#include "xdg-app-builtins.h"
-#include "xdg-app-utils.h"
+#include "flatpak-builtins.h"
+#include "flatpak-utils.h"
 
 static gboolean opt_user;
 static gboolean opt_system;
diff --git a/app/xdg-app-builtins-install.c b/app/flatpak-builtins-install.c
index 57b29ca..1034dac 100644
--- a/app/xdg-app-builtins-install.c
+++ b/app/flatpak-builtins-install.c
@@ -30,9 +30,9 @@
 #include "libgsystem.h"
 #include "libglnx/libglnx.h"
 
-#include "xdg-app-builtins.h"
-#include "xdg-app-utils.h"
-#include "xdg-app-chain-input-stream.h"
+#include "flatpak-builtins.h"
+#include "flatpak-utils.h"
+#include "flatpak-chain-input-stream.h"
 
 static char *opt_arch;
 static char **opt_gpg_file;
diff --git a/app/xdg-app-builtins-list-remotes.c b/app/flatpak-builtins-list-remotes.c
index 3040e0d..70c9afb 100644
--- a/app/xdg-app-builtins-list-remotes.c
+++ b/app/flatpak-builtins-list-remotes.c
@@ -28,8 +28,8 @@
 #include "libgsystem.h"
 #include "libglnx/libglnx.h"
 
-#include "xdg-app-builtins.h"
-#include "xdg-app-utils.h"
+#include "flatpak-builtins.h"
+#include "flatpak-utils.h"
 
 static gboolean opt_show_details;
 static gboolean opt_user;
diff --git a/app/xdg-app-builtins-list.c b/app/flatpak-builtins-list.c
index 3d5c6a5..34e7e57 100644
--- a/app/xdg-app-builtins-list.c
+++ b/app/flatpak-builtins-list.c
@@ -28,8 +28,8 @@
 #include "libgsystem.h"
 #include "libglnx/libglnx.h"
 
-#include "xdg-app-builtins.h"
-#include "xdg-app-utils.h"
+#include "flatpak-builtins.h"
+#include "flatpak-utils.h"
 
 static gboolean opt_show_details;
 static gboolean opt_user;
diff --git a/app/xdg-app-builtins-ls-remote.c b/app/flatpak-builtins-ls-remote.c
index 4e186f0..ed1b62a 100644
--- a/app/xdg-app-builtins-ls-remote.c
+++ b/app/flatpak-builtins-ls-remote.c
@@ -28,8 +28,8 @@
 #include "libgsystem.h"
 #include "libglnx/libglnx.h"
 
-#include "xdg-app-builtins.h"
-#include "xdg-app-utils.h"
+#include "flatpak-builtins.h"
+#include "flatpak-utils.h"
 
 static gboolean opt_show_details;
 static gboolean opt_runtime;
diff --git a/app/xdg-app-builtins-make-current.c b/app/flatpak-builtins-make-current.c
index 14c86a3..be623f2 100644
--- a/app/xdg-app-builtins-make-current.c
+++ b/app/flatpak-builtins-make-current.c
@@ -28,8 +28,8 @@
 #include "libgsystem.h"
 #include "libglnx/libglnx.h"
 
-#include "xdg-app-builtins.h"
-#include "xdg-app-utils.h"
+#include "flatpak-builtins.h"
+#include "flatpak-utils.h"
 
 static char *opt_arch;
 
diff --git a/app/xdg-app-builtins-override.c b/app/flatpak-builtins-override.c
index e707af2..5061179 100644
--- a/app/xdg-app-builtins-override.c
+++ b/app/flatpak-builtins-override.c
@@ -30,9 +30,9 @@
 #include "libgsystem.h"
 #include "libglnx/libglnx.h"
 
-#include "xdg-app-builtins.h"
-#include "xdg-app-utils.h"
-#include "xdg-app-run.h"
+#include "flatpak-builtins.h"
+#include "flatpak-utils.h"
+#include "flatpak-run.h"
 
 static GOptionEntry options[] = {
   { NULL }
diff --git a/app/xdg-app-builtins-repo-update.c b/app/flatpak-builtins-repo-update.c
index 378d380..9efad5a 100644
--- a/app/xdg-app-builtins-repo-update.c
+++ b/app/flatpak-builtins-repo-update.c
@@ -28,8 +28,8 @@
 #include "libgsystem.h"
 #include "libglnx/libglnx.h"
 
-#include "xdg-app-builtins.h"
-#include "xdg-app-utils.h"
+#include "flatpak-builtins.h"
+#include "flatpak-utils.h"
 
 static char *opt_title;
 static char *opt_gpg_homedir;
diff --git a/app/xdg-app-builtins-run.c b/app/flatpak-builtins-run.c
index 377ae8d..c00b593 100644
--- a/app/xdg-app-builtins-run.c
+++ b/app/flatpak-builtins-run.c
@@ -30,10 +30,10 @@
 #include "libgsystem.h"
 #include "libglnx/libglnx.h"
 
-#include "xdg-app-builtins.h"
-#include "xdg-app-utils.h"
-#include "xdg-app-dbus.h"
-#include "xdg-app-run.h"
+#include "flatpak-builtins.h"
+#include "flatpak-utils.h"
+#include "flatpak-dbus.h"
+#include "flatpak-run.h"
 
 static char *opt_arch;
 static char *opt_branch;
diff --git a/app/xdg-app-builtins-uninstall.c b/app/flatpak-builtins-uninstall.c
index 41ad74c..b488922 100644
--- a/app/xdg-app-builtins-uninstall.c
+++ b/app/flatpak-builtins-uninstall.c
@@ -28,8 +28,8 @@
 #include "libgsystem.h"
 #include "libglnx/libglnx.h"
 
-#include "xdg-app-builtins.h"
-#include "xdg-app-utils.h"
+#include "flatpak-builtins.h"
+#include "flatpak-utils.h"
 
 static char *opt_arch;
 static gboolean opt_keep_ref;
diff --git a/app/xdg-app-builtins-update.c b/app/flatpak-builtins-update.c
index 9918942..748eed2 100644
--- a/app/xdg-app-builtins-update.c
+++ b/app/flatpak-builtins-update.c
@@ -28,8 +28,8 @@
 #include "libgsystem.h"
 #include "libglnx/libglnx.h"
 
-#include "xdg-app-builtins.h"
-#include "xdg-app-utils.h"
+#include "flatpak-builtins.h"
+#include "flatpak-utils.h"
 
 static char *opt_arch;
 static char *opt_commit;
diff --git a/app/xdg-app-builtins.h b/app/flatpak-builtins.h
index 71af4b4..1f6cda5 100644
--- a/app/xdg-app-builtins.h
+++ b/app/flatpak-builtins.h
@@ -24,13 +24,13 @@
 #include <ostree.h>
 #include <gio/gio.h>
 
-#include "xdg-app-dir.h"
+#include "flatpak-dir.h"
 
 G_BEGIN_DECLS
 
 typedef enum {
   FLATPAK_BUILTIN_FLAG_NO_DIR = 1 << 0,
-    FLATPAK_BUILTIN_FLAG_NO_REPO = 1 << 1,
+  FLATPAK_BUILTIN_FLAG_NO_REPO = 1 << 1,
 } FlatpakBuiltinFlags;
 
 gboolean flatpak_option_context_parse (GOptionContext     *context,
diff --git a/app/xdg-app-main.c b/app/flatpak-main.c
index 5acdbc8..e5fbb57 100644
--- a/app/xdg-app-main.c
+++ b/app/flatpak-main.c
@@ -29,8 +29,8 @@
 #include "libglnx/libglnx.h"
 #include "libgsystem.h"
 
-#include "xdg-app-builtins.h"
-#include "xdg-app-utils.h"
+#include "flatpak-builtins.h"
+#include "flatpak-utils.h"
 
 static gboolean opt_verbose;
 static gboolean opt_version;
diff --git a/builder/Makefile.am.inc b/builder/Makefile.am.inc
index 918baa8..c6d42b1 100644
--- a/builder/Makefile.am.inc
+++ b/builder/Makefile.am.inc
@@ -3,7 +3,7 @@ bin_PROGRAMS += \
 	$(NULL)
 
 xdg_app_builder_SOURCES = \
-	builder/xdg-app-builder-main.c \
+	builder/builder-main.c \
 	builder/builder-manifest.c \
 	builder/builder-manifest.h \
 	builder/builder-options.c \
diff --git a/builder/builder-cache.c b/builder/builder-cache.c
index 9c57af1..a401377 100644
--- a/builder/builder-cache.c
+++ b/builder/builder-cache.c
@@ -32,7 +32,7 @@
 #include "libglnx/libglnx.h"
 #include "libgsystem.h"
 
-#include "xdg-app-utils.h"
+#include "flatpak-utils.h"
 #include "builder-utils.h"
 #include "builder-cache.h"
 
diff --git a/builder/builder-context.c b/builder/builder-context.c
index 07d0e05..f0e127d 100644
--- a/builder/builder-context.c
+++ b/builder/builder-context.c
@@ -28,7 +28,7 @@
 #include <sys/statfs.h>
 #include <unistd.h>
 
-#include "xdg-app-utils.h"
+#include "flatpak-utils.h"
 #include "builder-context.h"
 
 struct BuilderContext
diff --git a/builder/xdg-app-builder-main.c b/builder/builder-main.c
index 41c5e18..41c5e18 100644
--- a/builder/xdg-app-builder-main.c
+++ b/builder/builder-main.c
diff --git a/builder/builder-manifest.c b/builder/builder-manifest.c
index d6e1545..95ae42b 100644
--- a/builder/builder-manifest.c
+++ b/builder/builder-manifest.c
@@ -29,7 +29,7 @@
 
 #include "builder-manifest.h"
 #include "builder-utils.h"
-#include "xdg-app-utils.h"
+#include "flatpak-utils.h"
 
 #include "libgsystem.h"
 #include "libglnx/libglnx.h"
diff --git a/builder/builder-module.c b/builder/builder-module.c
index ad0d815..178b071 100644
--- a/builder/builder-module.c
+++ b/builder/builder-module.c
@@ -31,7 +31,7 @@
 #include "libglnx/libglnx.h"
 #include "libgsystem.h"
 
-#include "xdg-app-utils.h"
+#include "flatpak-utils.h"
 #include "builder-utils.h"
 #include "builder-module.h"
 
diff --git a/builder/builder-source-archive.c b/builder/builder-source-archive.c
index 89a2423..66d4527 100644
--- a/builder/builder-source-archive.c
+++ b/builder/builder-source-archive.c
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <sys/statfs.h>
 
-#include "xdg-app-utils.h"
+#include "flatpak-utils.h"
 
 #include "builder-utils.h"
 #include "builder-source-archive.h"
diff --git a/builder/builder-source-bzr.c b/builder/builder-source-bzr.c
index eee4687..a2337c2 100644
--- a/builder/builder-source-bzr.c
+++ b/builder/builder-source-bzr.c
@@ -31,7 +31,7 @@
 
 #include "builder-source-bzr.h"
 #include "builder-utils.h"
-#include "xdg-app-utils.h"
+#include "flatpak-utils.h"
 
 struct BuilderSourceBzr
 {
diff --git a/builder/builder-source-file.c b/builder/builder-source-file.c
index 924d4b6..2756cfd 100644
--- a/builder/builder-source-file.c
+++ b/builder/builder-source-file.c
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <sys/statfs.h>
 
-#include "xdg-app-utils.h"
+#include "flatpak-utils.h"
 
 #include "builder-utils.h"
 #include "builder-source-file.h"
diff --git a/builder/builder-source-git.c b/builder/builder-source-git.c
index d190f6e..a9f42ef 100644
--- a/builder/builder-source-git.c
+++ b/builder/builder-source-git.c
@@ -32,7 +32,7 @@
 
 #include "builder-source-git.h"
 #include "builder-utils.h"
-#include "xdg-app-utils.h"
+#include "flatpak-utils.h"
 
 struct BuilderSourceGit
 {
diff --git a/builder/builder-source-patch.c b/builder/builder-source-patch.c
index 04811b1..5a2041a 100644
--- a/builder/builder-source-patch.c
+++ b/builder/builder-source-patch.c
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <sys/statfs.h>
 
-#include "xdg-app-utils.h"
+#include "flatpak-utils.h"
 
 #include "builder-utils.h"
 #include "builder-source-patch.h"
diff --git a/builder/builder-utils.c b/builder/builder-utils.c
index 8e6a88f..b82a127 100644
--- a/builder/builder-utils.c
+++ b/builder/builder-utils.c
@@ -29,7 +29,7 @@
 
 #include <string.h>
 
-#include "xdg-app-utils.h"
+#include "flatpak-utils.h"
 #include "builder-utils.h"
 
 char *
diff --git a/common/Makefile.am.inc b/common/Makefile.am.inc
index 0c88972..b0069fb 100644
--- a/common/Makefile.am.inc
+++ b/common/Makefile.am.inc
@@ -1,14 +1,14 @@
 noinst_LTLIBRARIES += libxdgapp-common.la
 
-dbus_built_sources = common/xdg-app-dbus.c common/xdg-app-dbus.h
-systemd_dbus_built_sources = common/xdg-app-systemd-dbus.c common/xdg-app-systemd-dbus.h
+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
 	$(AM_V_GEN) $(GDBUS_CODEGEN)				\
 		--interface-prefix org.freedesktop.XdgApp.	\
-		--c-namespace XdgApp				\
-		--generate-c-code $(builddir)/common/xdg-app-dbus	\
+		--c-namespace Flatpak				\
+		--generate-c-code $(builddir)/common/flatpak-dbus	\
 		$(srcdir)/data/org.freedesktop.XdgApp.xml	\
 		$(NULL)
 
@@ -16,29 +16,29 @@ $(systemd_dbus_built_sources) : data/org.freedesktop.systemd1.xml
 	$(AM_V_GEN) $(GDBUS_CODEGEN)				\
 		--interface-prefix org.freedesktop.systemd1.	\
 		--c-namespace Systemd				\
-		--generate-c-code $(builddir)/common/xdg-app-systemd-dbus	\
+		--generate-c-code $(builddir)/common/flatpak-systemd-dbus	\
 		$(srcdir)/data/org.freedesktop.systemd1.xml	\
 		$(NULL)
 
 libxdgapp_common_la_SOURCES = \
-	common/xdg-app-common-types.h \
-	common/xdg-app-dir.c \
-	common/xdg-app-dir.h \
-	common/xdg-app-run.c \
-	common/xdg-app-run.h \
-	common/xdg-app-portal-error.c \
-	common/xdg-app-portal-error.h \
-	common/xdg-app-utils.c \
-	common/xdg-app-utils.h \
-	common/xdg-app-chain-input-stream.c \
-	common/xdg-app-chain-input-stream.h \
+	common/flatpak-common-types.h \
+	common/flatpak-dir.c \
+	common/flatpak-dir.h \
+	common/flatpak-run.c \
+	common/flatpak-run.h \
+	common/flatpak-portal-error.c \
+	common/flatpak-portal-error.h \
+	common/flatpak-utils.c \
+	common/flatpak-utils.h \
+	common/flatpak-chain-input-stream.c \
+	common/flatpak-chain-input-stream.h \
 	common/gvdb/gvdb-reader.h	\
 	common/gvdb/gvdb-format.h	\
 	common/gvdb/gvdb-reader.c	\
 	common/gvdb/gvdb-builder.h	\
 	common/gvdb/gvdb-builder.c	\
-	common/xdg-app-db.c \
-	common/xdg-app-db.h \
+	common/flatpak-db.c \
+	common/flatpak-db.h \
 	$(dbus_built_sources)		\
 	$(systemd_dbus_built_sources)	\
 	$(NULL)
diff --git a/common/xdg-app-chain-input-stream.c b/common/flatpak-chain-input-stream.c
index d7be407..6dd68a0 100644
--- a/common/xdg-app-chain-input-stream.c
+++ b/common/flatpak-chain-input-stream.c
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include "xdg-app-chain-input-stream.h"
+#include "flatpak-chain-input-stream.h"
 
 enum {
   PROP_0,
diff --git a/common/xdg-app-chain-input-stream.h b/common/flatpak-chain-input-stream.h
index ed66560..ed66560 100644
--- a/common/xdg-app-chain-input-stream.h
+++ b/common/flatpak-chain-input-stream.h
diff --git a/common/xdg-app-common-types.h b/common/flatpak-common-types.h
index 0243eca..0243eca 100644
--- a/common/xdg-app-common-types.h
+++ b/common/flatpak-common-types.h
diff --git a/common/xdg-app-db.c b/common/flatpak-db.c
index 9e8af7c..429700d 100644
--- a/common/xdg-app-db.c
+++ b/common/flatpak-db.c
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <sys/statfs.h>
 
-#include "xdg-app-db.h"
+#include "flatpak-db.h"
 #include "gvdb/gvdb-reader.h"
 #include "gvdb/gvdb-builder.h"
 
diff --git a/common/xdg-app-db.h b/common/flatpak-db.h
index 738cf9b..738cf9b 100644
--- a/common/xdg-app-db.h
+++ b/common/flatpak-db.h
diff --git a/common/xdg-app-dir.c b/common/flatpak-dir.c
index 0fa1afa..1aac10c 100644
--- a/common/xdg-app-dir.c
+++ b/common/flatpak-dir.c
@@ -31,9 +31,9 @@
 #include "libgsystem.h"
 #include "libglnx/libglnx.h"
 
-#include "xdg-app-dir.h"
-#include "xdg-app-utils.h"
-#include "xdg-app-run.h"
+#include "flatpak-dir.h"
+#include "flatpak-utils.h"
+#include "flatpak-run.h"
 
 #include "errno.h"
 
diff --git a/common/xdg-app-dir.h b/common/flatpak-dir.h
index cfedccd..495b81f 100644
--- a/common/xdg-app-dir.h
+++ b/common/flatpak-dir.h
@@ -24,7 +24,7 @@
 #include <ostree.h>
 
 #include "libglnx/libglnx.h"
-#include <xdg-app-common-types.h>
+#include <flatpak-common-types.h>
 
 #define FLATPAK_TYPE_DIR flatpak_dir_get_type ()
 #define FLATPAK_DIR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FLATPAK_TYPE_DIR, FlatpakDir))
diff --git a/common/xdg-app-portal-error.c b/common/flatpak-portal-error.c
index 036aca7..7672f0f 100644
--- a/common/xdg-app-portal-error.c
+++ b/common/flatpak-portal-error.c
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include "xdg-app-portal-error.h"
+#include "flatpak-portal-error.h"
 
 #include <gio/gio.h>
 
diff --git a/common/xdg-app-portal-error.h b/common/flatpak-portal-error.h
index 2ff02e8..2ff02e8 100644
--- a/common/xdg-app-portal-error.h
+++ b/common/flatpak-portal-error.h
diff --git a/common/xdg-app-run.c b/common/flatpak-run.c
index 2062657..ff4eb37 100644
--- a/common/xdg-app-run.c
+++ b/common/flatpak-run.c
@@ -40,10 +40,10 @@
 #include "libgsystem.h"
 #include "libglnx/libglnx.h"
 
-#include "xdg-app-run.h"
-#include "xdg-app-proxy.h"
-#include "xdg-app-utils.h"
-#include "xdg-app-systemd-dbus.h"
+#include "flatpak-run.h"
+#include "flatpak-proxy.h"
+#include "flatpak-utils.h"
+#include "flatpak-systemd-dbus.h"
 
 #define DEFAULT_SHELL "/bin/sh"
 
diff --git a/common/xdg-app-run.h b/common/flatpak-run.h
index d066740..626fabd 100644
--- a/common/xdg-app-run.h
+++ b/common/flatpak-run.h
@@ -22,8 +22,8 @@
 #define __FLATPAK_RUN_H__
 
 #include "libglnx/libglnx.h"
-#include "dbus-proxy/xdg-app-proxy.h"
-#include "xdg-app-common-types.h"
+#include "dbus-proxy/flatpak-proxy.h"
+#include "flatpak-common-types.h"
 
 gboolean flatpak_run_in_transient_unit (const char *app_id,
                                         GError    **error);
diff --git a/common/xdg-app-utils.c b/common/flatpak-utils.c
index 5fbfabf..dbe2f99 100644
--- a/common/xdg-app-utils.c
+++ b/common/flatpak-utils.c
@@ -20,9 +20,9 @@
 
 #include "config.h"
 
-#include "xdg-app-utils.h"
-#include "xdg-app-dir.h"
-#include "xdg-app-portal-error.h"
+#include "flatpak-utils.h"
+#include "flatpak-dir.h"
+#include "flatpak-portal-error.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/common/xdg-app-utils.h b/common/flatpak-utils.h
index a2f7e45..7187015 100644
--- a/common/xdg-app-utils.h
+++ b/common/flatpak-utils.h
@@ -27,8 +27,8 @@
 #include "libglnx/libglnx.h"
 #include <gio/gio.h>
 #include <libsoup/soup.h>
-#include "xdg-app-dbus.h"
-#include "xdg-app-dir.h"
+#include "flatpak-dbus.h"
+#include "flatpak-dir.h"
 #include <ostree.h>
 
 gboolean flatpak_fail (GError    **error,
diff --git a/configure.ac b/configure.ac
index d548648..5371b96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ AC_DISABLE_STATIC
 LT_PREREQ([2.2.6])
 LT_INIT([disable-static])
 
-AC_CONFIG_SRCDIR([common/xdg-app-dir.c])
+AC_CONFIG_SRCDIR([common/flatpak-dir.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([1.11 no-define no-dist-gzip dist-xz tar-ustar foreign subdir-objects])
@@ -363,7 +363,7 @@ Makefile
 doc/Makefile
 doc/reference/Makefile
 xdg-app.pc
-lib/xdg-app-version-macros.h
+lib/flatpak-version-macros.h
 doc/reference/version.xml
 po/Makefile.in
 ])
diff --git a/dbus-proxy/Makefile.am.inc b/dbus-proxy/Makefile.am.inc
index 42bf93d..6cf4947 100644
--- a/dbus-proxy/Makefile.am.inc
+++ b/dbus-proxy/Makefile.am.inc
@@ -3,8 +3,8 @@ libexec_PROGRAMS += \
 	$(NULL)
 
 xdg_dbus_proxy_SOURCES = \
-	dbus-proxy/xdg-app-proxy.c	\
-	dbus-proxy/xdg-app-proxy.h	\
+	dbus-proxy/flatpak-proxy.c	\
+	dbus-proxy/flatpak-proxy.h	\
 	dbus-proxy/dbus-proxy.c	        \
 	$(NULL)
 
diff --git a/dbus-proxy/dbus-proxy.c b/dbus-proxy/dbus-proxy.c
index ac44d66..6ed1697 100644
--- a/dbus-proxy/dbus-proxy.c
+++ b/dbus-proxy/dbus-proxy.c
@@ -28,7 +28,7 @@
 
 #include "libglnx/libglnx.h"
 
-#include "xdg-app-proxy.h"
+#include "flatpak-proxy.h"
 
 GList *proxies;
 int sync_fd = -1;
diff --git a/dbus-proxy/xdg-app-proxy.c b/dbus-proxy/flatpak-proxy.c
index f767818..8cf4999 100644
--- a/dbus-proxy/xdg-app-proxy.c
+++ b/dbus-proxy/flatpak-proxy.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "xdg-app-proxy.h"
+#include "flatpak-proxy.h"
 
 #include <gio/gunixsocketaddress.h>
 #include <gio/gunixconnection.h>
diff --git a/dbus-proxy/xdg-app-proxy.h b/dbus-proxy/flatpak-proxy.h
index fee110d..fee110d 100644
--- a/dbus-proxy/xdg-app-proxy.h
+++ b/dbus-proxy/flatpak-proxy.h
diff --git a/document-portal/xdp-fuse.c b/document-portal/xdp-fuse.c
index 3bbc46d..77c6f7a 100644
--- a/document-portal/xdp-fuse.c
+++ b/document-portal/xdp-fuse.c
@@ -15,10 +15,10 @@
 #include <gio/gio.h>
 #include <pthread.h>
 
-#include "xdg-app-portal-error.h"
+#include "flatpak-portal-error.h"
 #include "xdp-fuse.h"
 #include "xdp-util.h"
-#include "xdg-app-utils.h"
+#include "flatpak-utils.h"
 
 #define NON_DOC_DIR_PERMS 0500
 #define DOC_DIR_PERMS 0700
diff --git a/document-portal/xdp-fuse.h b/document-portal/xdp-fuse.h
index d7b09d1..e208b53 100644
--- a/document-portal/xdp-fuse.h
+++ b/document-portal/xdp-fuse.h
@@ -2,7 +2,7 @@
 #define XDP_FUSE_H
 
 #include <glib.h>
-#include "xdg-app-db.h"
+#include "flatpak-db.h"
 
 G_BEGIN_DECLS
 
diff --git a/document-portal/xdp-main.c b/document-portal/xdp-main.c
index a09c034..52b0b93 100644
--- a/document-portal/xdp-main.c
+++ b/document-portal/xdp-main.c
@@ -13,10 +13,10 @@
 #include <gio/gunixfdlist.h>
 #include "xdp-dbus.h"
 #include "xdp-util.h"
-#include "xdg-app-db.h"
-#include "xdg-app-dbus.h"
-#include "xdg-app-utils.h"
-#include "xdg-app-portal-error.h"
+#include "flatpak-db.h"
+#include "flatpak-dbus.h"
+#include "flatpak-utils.h"
+#include "flatpak-portal-error.h"
 #include "xdp-fuse.h"
 
 #include <sys/eventfd.h>
diff --git a/document-portal/xdp-util.c b/document-portal/xdp-util.c
index a2d2c59..0f5f085 100644
--- a/document-portal/xdp-util.c
+++ b/document-portal/xdp-util.c
@@ -2,7 +2,7 @@
 #include <string.h>
 #include <errno.h>
 #include <gio/gio.h>
-#include "xdg-app-portal-error.h"
+#include "flatpak-portal-error.h"
 #include "xdp-util.h"
 
 const char **
diff --git a/document-portal/xdp-util.h b/document-portal/xdp-util.h
index f4bfdbf..007a243 100644
--- a/document-portal/xdp-util.h
+++ b/document-portal/xdp-util.h
@@ -2,7 +2,7 @@
 #define XDP_UTIL_H
 
 #include <gio/gio.h>
-#include "xdg-app-db.h"
+#include "flatpak-db.h"
 #include "xdp-enums.h"
 
 G_BEGIN_DECLS
diff --git a/lib/Makefile.am.inc b/lib/Makefile.am.inc
index bfd2b51..fa75fa6 100644
--- a/lib/Makefile.am.inc
+++ b/lib/Makefile.am.inc
@@ -2,58 +2,58 @@ lib_LTLIBRARIES += libxdg-app.la
 noinst_PROGRAMS += test-libxdg-app
 
 public_headers = \
-	lib/xdg-app.h \
-	lib/xdg-app-ref.h \
-	lib/xdg-app-error.h \
-	lib/xdg-app-installed-ref.h \
-	lib/xdg-app-remote-ref.h \
-	lib/xdg-app-bundle-ref.h \
-	lib/xdg-app-installation.h \
-	lib/xdg-app-remote.h \
-	lib/xdg-app-version-macros.h \
+	lib/flatpak.h \
+	lib/flatpak-ref.h \
+	lib/flatpak-error.h \
+	lib/flatpak-installed-ref.h \
+	lib/flatpak-remote-ref.h \
+	lib/flatpak-bundle-ref.h \
+	lib/flatpak-installation.h \
+	lib/flatpak-remote.h \
+	lib/flatpak-version-macros.h \
 	$(NULL)
 
 generated_public_headers = \
-	lib/xdg-app-enum-types.h \
+	lib/flatpak-enum-types.h \
 	$(NULL)
 
-BUILT_SOURCES += 		\
-	lib/xdg-app-enum-types.c \
-	lib/xdg-app-enum-types.h \
+BUILT_SOURCES += \
+	lib/flatpak-enum-types.c \
+	lib/flatpak-enum-types.h \
 	$(NULL)
 
-DISTCLEANFILES += 		\
-	lib/xdg-app-enum-types.c \
-	lib/xdg-app-enum-types.h \
+DISTCLEANFILES += \
+	lib/flatpak-enum-types.c \
+	lib/flatpak-enum-types.h \
 	$(NULL)
 
 
-lib/xdg-app-enum-types.h: $(public_headers) lib/xdg-app-enum-types.h.template
+lib/flatpak-enum-types.h: $(public_headers) lib/flatpak-enum-types.h.template
 	$(AM_V_GEN) $(GLIB_MKENUMS) --template $(filter %.template,$^) $(filter-out %.template,$^) > \
-	    lib/xdg-app-enum-types.h.tmp && mv lib/xdg-app-enum-types.h.tmp lib/xdg-app-enum-types.h
+	    lib/flatpak-enum-types.h.tmp && mv lib/flatpak-enum-types.h.tmp lib/flatpak-enum-types.h
 
-lib/xdg-app-enum-types.c: $(public_headers) lib/xdg-app-enum-types.c.template
+lib/flatpak-enum-types.c: $(public_headers) lib/flatpak-enum-types.c.template
 	$(AM_V_GEN) $(GLIB_MKENUMS) --template $(filter %.template,$^) $(filter-out %.template,$^) > \
-	    lib/xdg-app-enum-types.c.tmp && mv lib/xdg-app-enum-types.c.tmp lib/xdg-app-enum-types.c
+	    lib/flatpak-enum-types.c.tmp && mv lib/flatpak-enum-types.c.tmp lib/flatpak-enum-types.c
 
-EXTRA_DIST += lib/xdg-app-enum-types.c.template lib/xdg-app-enum-types.h.template
+EXTRA_DIST += lib/flatpak-enum-types.c.template lib/flatpak-enum-types.h.template
 
 xdgappincludedir = $(includedir)/xdg-app
 xdgappinclude_HEADERS = $(public_headers) $(generated_public_headers)
 
 sources = \
-	lib/xdg-app.c \
-	lib/xdg-app-enum-types.c \
-	lib/xdg-app-ref.c \
-	lib/xdg-app-installed-ref.c \
-	lib/xdg-app-installed-ref-private.h \
-	lib/xdg-app-remote-ref.c \
-	lib/xdg-app-bundle-ref.c \
-	lib/xdg-app-remote-ref-private.h \
-	lib/xdg-app-remote-private.h \
-	lib/xdg-app-remote.c \
-	lib/xdg-app-error.c \
-	lib/xdg-app-installation.c \
+	lib/flatpak.c \
+	lib/flatpak-enum-types.c \
+	lib/flatpak-ref.c \
+	lib/flatpak-installed-ref.c \
+	lib/flatpak-installed-ref-private.h \
+	lib/flatpak-remote-ref.c \
+	lib/flatpak-bundle-ref.c \
+	lib/flatpak-remote-ref-private.h \
+	lib/flatpak-remote-private.h \
+	lib/flatpak-remote.c \
+	lib/flatpak-error.c \
+	lib/flatpak-installation.c \
 	$(NULL)
 
 libxdg_app_la_SOURCES = \
@@ -120,8 +120,8 @@ Flatpak_1_0_gir_CFLAGS = $(libxdg_app_la_CFLAGS)
 Flatpak_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
 Flatpak_1_0_gir_SCANNERFLAGS = \
         --warn-all \
-        --c-include='xdg-app.h' \
-        --pkg-export=xdg-app
+        --c-include='flatpak.h' \
+        --pkg-export=flatpak
 
 INTROSPECTION_GIRS += Flatpak-1.0.gir
 
diff --git a/lib/xdg-app-bundle-ref.c b/lib/flatpak-bundle-ref.c
index 44e9c75..ba3955e 100644
--- a/lib/xdg-app-bundle-ref.c
+++ b/lib/flatpak-bundle-ref.c
@@ -22,9 +22,9 @@
 
 #include <string.h>
 
-#include "xdg-app-utils.h"
-#include "xdg-app-bundle-ref.h"
-#include "xdg-app-enum-types.h"
+#include "flatpak-utils.h"
+#include "flatpak-bundle-ref.h"
+#include "flatpak-enum-types.h"
 
 typedef struct _FlatpakBundleRefPrivate FlatpakBundleRefPrivate;
 
diff --git a/lib/xdg-app-bundle-ref.h b/lib/flatpak-bundle-ref.h
index 32b7875..e61cb0f 100644
--- a/lib/xdg-app-bundle-ref.h
+++ b/lib/flatpak-bundle-ref.h
@@ -19,7 +19,7 @@
  */
 
 #if !defined(__FLATPAK_H_INSIDE__) && !defined(FLATPAK_COMPILATION)
-#error "Only <xdg-app.h> can be included directly."
+#error "Only <flatpak.h> can be included directly."
 #endif
 
 #ifndef __FLATPAK_BUNDLE_REF_H__
@@ -28,7 +28,7 @@
 typedef struct _FlatpakBundleRef FlatpakBundleRef;
 
 #include <gio/gio.h>
-#include <xdg-app-ref.h>
+#include <flatpak-ref.h>
 
 #define FLATPAK_TYPE_BUNDLE_REF flatpak_bundle_ref_get_type ()
 #define FLATPAK_BUNDLE_REF(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FLATPAK_TYPE_BUNDLE_REF, FlatpakBundleRef))
diff --git a/lib/xdg-app-enum-types.c.template b/lib/flatpak-enum-types.c.template
index dac7564..f811888 100644
--- a/lib/xdg-app-enum-types.c.template
+++ b/lib/flatpak-enum-types.c.template
@@ -1,8 +1,8 @@
 /*** BEGIN file-header ***/
 #include "config.h"
-#include <xdg-app-utils.h>
-#include <xdg-app.h>
-#include <xdg-app-enum-types.h>
+#include <flatpak-utils.h>
+#include <flatpak.h>
+#include <flatpak-enum-types.h>
 #include <gio/gio.h>
 
 /*** END file-header ***/
diff --git a/lib/xdg-app-enum-types.h.template b/lib/flatpak-enum-types.h.template
index 5b67b9c..5b67b9c 100644
--- a/lib/xdg-app-enum-types.h.template
+++ b/lib/flatpak-enum-types.h.template
diff --git a/lib/xdg-app-error.c b/lib/flatpak-error.c
index 47ffeba..806fbe9 100644
--- a/lib/xdg-app-error.c
+++ b/lib/flatpak-error.c
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include "xdg-app-error.h"
+#include "flatpak-error.h"
 
 #include <gio/gio.h>
 
diff --git a/lib/xdg-app-error.h b/lib/flatpak-error.h
index 9c7b593..9c7b593 100644
--- a/lib/xdg-app-error.h
+++ b/lib/flatpak-error.h
diff --git a/lib/xdg-app-installation.c b/lib/flatpak-installation.c
index ca9c14c..5e9d949 100644
--- a/lib/xdg-app-installation.c
+++ b/lib/flatpak-installation.c
@@ -23,15 +23,15 @@
 #include <string.h>
 
 #include "libgsystem.h"
-#include "xdg-app-utils.h"
-#include "xdg-app-installation.h"
-#include "xdg-app-installed-ref-private.h"
-#include "xdg-app-remote-private.h"
-#include "xdg-app-remote-ref-private.h"
-#include "xdg-app-enum-types.h"
-#include "xdg-app-dir.h"
-#include "xdg-app-run.h"
-#include "xdg-app-error.h"
+#include "flatpak-utils.h"
+#include "flatpak-installation.h"
+#include "flatpak-installed-ref-private.h"
+#include "flatpak-remote-private.h"
+#include "flatpak-remote-ref-private.h"
+#include "flatpak-enum-types.h"
+#include "flatpak-dir.h"
+#include "flatpak-run.h"
+#include "flatpak-error.h"
 
 /**
  * SECTION:xdg-app-installation
diff --git a/lib/xdg-app-installation.h b/lib/flatpak-installation.h
index e30194b..c3a1b19 100644
--- a/lib/xdg-app-installation.h
+++ b/lib/flatpak-installation.h
@@ -19,7 +19,7 @@
  */
 
 #if !defined(__FLATPAK_H_INSIDE__) && !defined(FLATPAK_COMPILATION)
-#error "Only <xdg-app.h> can be included directly."
+#error "Only <flatpak.h> can be included directly."
 #endif
 
 #ifndef __FLATPAK_INSTALLATION_H__
@@ -28,8 +28,8 @@
 typedef struct _FlatpakInstallation FlatpakInstallation;
 
 #include <gio/gio.h>
-#include <xdg-app-installed-ref.h>
-#include <xdg-app-remote.h>
+#include <flatpak-installed-ref.h>
+#include <flatpak-remote.h>
 
 #define FLATPAK_TYPE_INSTALLATION flatpak_installation_get_type ()
 #define FLATPAK_INSTALLATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FLATPAK_TYPE_INSTALLATION, FlatpakInstallation))
diff --git a/lib/xdg-app-installed-ref-private.h b/lib/flatpak-installed-ref-private.h
index e24acc3..2dc36e6 100644
--- a/lib/xdg-app-installed-ref-private.h
+++ b/lib/flatpak-installed-ref-private.h
@@ -19,14 +19,14 @@
  */
 
 #if !defined(__FLATPAK_H_INSIDE__) && !defined(FLATPAK_COMPILATION)
-#error "Only <xdg-app.h> can be included directly."
+#error "Only <flatpak.h> can be included directly."
 #endif
 
 #ifndef __FLATPAK_INSTALLED_REF_PRIVATE_H__
 #define __FLATPAK_INSTALLED_REF_PRIVATE_H__
 
-#include <xdg-app-installed-ref.h>
-#include <xdg-app-dir.h>
+#include <flatpak-installed-ref.h>
+#include <flatpak-dir.h>
 
 FlatpakInstalledRef *flatpak_installed_ref_new (const char  *full_ref,
                                                 const char  *commit,
diff --git a/lib/xdg-app-installed-ref.c b/lib/flatpak-installed-ref.c
index 0ed231a..4915064 100644
--- a/lib/xdg-app-installed-ref.c
+++ b/lib/flatpak-installed-ref.c
@@ -22,9 +22,9 @@
 
 #include <string.h>
 
-#include "xdg-app-utils.h"
-#include "xdg-app-installed-ref.h"
-#include "xdg-app-enum-types.h"
+#include "flatpak-utils.h"
+#include "flatpak-installed-ref.h"
+#include "flatpak-enum-types.h"
 
 /**
  * SECTION:xdg-app-installed-ref
diff --git a/lib/xdg-app-installed-ref.h b/lib/flatpak-installed-ref.h
index 863a066..7fb8629 100644
--- a/lib/xdg-app-installed-ref.h
+++ b/lib/flatpak-installed-ref.h
@@ -19,7 +19,7 @@
  */
 
 #if !defined(__FLATPAK_H_INSIDE__) && !defined(FLATPAK_COMPILATION)
-#error "Only <xdg-app.h> can be included directly."
+#error "Only <flatpak.h> can be included directly."
 #endif
 
 #ifndef __FLATPAK_INSTALLED_REF_H__
@@ -28,7 +28,7 @@
 typedef struct _FlatpakInstalledRef FlatpakInstalledRef;
 
 #include <gio/gio.h>
-#include <xdg-app-ref.h>
+#include <flatpak-ref.h>
 
 #define FLATPAK_TYPE_INSTALLED_REF flatpak_installed_ref_get_type ()
 #define FLATPAK_INSTALLED_REF(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FLATPAK_TYPE_INSTALLED_REF, FlatpakInstalledRef))
diff --git a/lib/xdg-app-ref.c b/lib/flatpak-ref.c
index b5137f7..686940b 100644
--- a/lib/xdg-app-ref.c
+++ b/lib/flatpak-ref.c
@@ -20,9 +20,9 @@
 
 #include "config.h"
 
-#include "xdg-app-utils.h"
-#include "xdg-app-ref.h"
-#include "xdg-app-enum-types.h"
+#include "flatpak-utils.h"
+#include "flatpak-ref.h"
+#include "flatpak-enum-types.h"
 
 /**
  * SECTION:xdg-app-ref
diff --git a/lib/xdg-app-ref.h b/lib/flatpak-ref.h
index 7e54739..201fd01 100644
--- a/lib/xdg-app-ref.h
+++ b/lib/flatpak-ref.h
@@ -19,7 +19,7 @@
  */
 
 #if !defined(__FLATPAK_H_INSIDE__) && !defined(FLATPAK_COMPILATION)
-#error "Only <xdg-app.h> can be included directly."
+#error "Only <flatpak.h> can be included directly."
 #endif
 
 #ifndef __FLATPAK_REF_H__
diff --git a/lib/xdg-app-remote-private.h b/lib/flatpak-remote-private.h
index 0a62841..9f79679 100644
--- a/lib/xdg-app-remote-private.h
+++ b/lib/flatpak-remote-private.h
@@ -19,14 +19,14 @@
  */
 
 #if !defined(__FLATPAK_H_INSIDE__) && !defined(FLATPAK_COMPILATION)
-#error "Only <xdg-app.h> can be included directly."
+#error "Only <flatpak.h> can be included directly."
 #endif
 
 #ifndef __FLATPAK_REMOTE_PRIVATE_H__
 #define __FLATPAK_REMOTE_PRIVATE_H__
 
-#include <xdg-app-remote.h>
-#include <xdg-app-dir.h>
+#include <flatpak-remote.h>
+#include <flatpak-dir.h>
 #include <ostree.h>
 
 FlatpakRemote *flatpak_remote_new (FlatpakDir *dir,
diff --git a/lib/xdg-app-remote-ref-private.h b/lib/flatpak-remote-ref-private.h
index 1971711..4a53995 100644
--- a/lib/xdg-app-remote-ref-private.h
+++ b/lib/flatpak-remote-ref-private.h
@@ -19,14 +19,14 @@
  */
 
 #if !defined(__FLATPAK_H_INSIDE__) && !defined(FLATPAK_COMPILATION)
-#error "Only <xdg-app.h> can be included directly."
+#error "Only <flatpak.h> can be included directly."
 #endif
 
 #ifndef __FLATPAK_REMOTE_REF_PRIVATE_H__
 #define __FLATPAK_REMOTE_REF_PRIVATE_H__
 
-#include <xdg-app-remote-ref.h>
-#include <xdg-app-dir.h>
+#include <flatpak-remote-ref.h>
+#include <flatpak-dir.h>
 
 FlatpakRemoteRef *flatpak_remote_ref_new (const char *full_ref,
                                           const char *commit,
diff --git a/lib/xdg-app-remote-ref.c b/lib/flatpak-remote-ref.c
index 081b11c..bfaad1b 100644
--- a/lib/xdg-app-remote-ref.c
+++ b/lib/flatpak-remote-ref.c
@@ -22,10 +22,10 @@
 
 #include <string.h>
 
-#include "xdg-app-utils.h"
-#include "xdg-app-remote-ref-private.h"
-#include "xdg-app-remote-ref.h"
-#include "xdg-app-enum-types.h"
+#include "flatpak-utils.h"
+#include "flatpak-remote-ref-private.h"
+#include "flatpak-remote-ref.h"
+#include "flatpak-enum-types.h"
 
 /**
  * SECTION:xdg-app-remote-ref
diff --git a/lib/xdg-app-remote-ref.h b/lib/flatpak-remote-ref.h
index da18f7e..9d7df22 100644
--- a/lib/xdg-app-remote-ref.h
+++ b/lib/flatpak-remote-ref.h
@@ -19,7 +19,7 @@
  */
 
 #if !defined(__FLATPAK_H_INSIDE__) && !defined(FLATPAK_COMPILATION)
-#error "Only <xdg-app.h> can be included directly."
+#error "Only <flatpak.h> can be included directly."
 #endif
 
 #ifndef __FLATPAK_REMOTE_REF_H__
@@ -28,7 +28,7 @@
 typedef struct _FlatpakRemoteRef FlatpakRemoteRef;
 
 #include <gio/gio.h>
-#include <xdg-app-ref.h>
+#include <flatpak-ref.h>
 
 #define FLATPAK_TYPE_REMOTE_REF flatpak_remote_ref_get_type ()
 #define FLATPAK_REMOTE_REF(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FLATPAK_TYPE_REMOTE_REF, FlatpakRemoteRef))
diff --git a/lib/xdg-app-remote.c b/lib/flatpak-remote.c
index 6b73ac2..1e1528a 100644
--- a/lib/xdg-app-remote.c
+++ b/lib/flatpak-remote.c
@@ -20,10 +20,10 @@
 
 #include "config.h"
 
-#include "xdg-app-utils.h"
-#include "xdg-app-remote-private.h"
-#include "xdg-app-remote-ref-private.h"
-#include "xdg-app-enum-types.h"
+#include "flatpak-utils.h"
+#include "flatpak-remote-private.h"
+#include "flatpak-remote-ref-private.h"
+#include "flatpak-enum-types.h"
 
 #include <string.h>
 
diff --git a/lib/xdg-app-remote.h b/lib/flatpak-remote.h
index 87e5149..dca8fc6 100644
--- a/lib/xdg-app-remote.h
+++ b/lib/flatpak-remote.h
@@ -19,7 +19,7 @@
  */
 
 #if !defined(__FLATPAK_H_INSIDE__) && !defined(FLATPAK_COMPILATION)
-#error "Only <xdg-app.h> can be included directly."
+#error "Only <flatpak.h> can be included directly."
 #endif
 
 #ifndef __FLATPAK_REMOTE_H__
@@ -28,7 +28,7 @@
 typedef struct _FlatpakRemote FlatpakRemote;
 
 #include <gio/gio.h>
-#include <xdg-app-remote-ref.h>
+#include <flatpak-remote-ref.h>
 
 #define FLATPAK_TYPE_REMOTE flatpak_remote_get_type ()
 #define FLATPAK_REMOTE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FLATPAK_TYPE_REMOTE, FlatpakRemote))
diff --git a/lib/xdg-app-version-macros.h.in b/lib/flatpak-version-macros.h.in
index 74eb77a..c010a5c 100644
--- a/lib/xdg-app-version-macros.h.in
+++ b/lib/flatpak-version-macros.h.in
@@ -19,7 +19,7 @@
  */
 
 #if !defined (__FLATPAK_H_INSIDE__) && !defined (FLATPAK_COMPILATION)
-#error "Only <xdg-app.h> can be included directly."
+#error "Only <flatpak.h> can be included directly."
 #endif
 
 #ifndef __FLATPAK_VERSION_MACROS_H__
diff --git a/lib/flatpak.c b/lib/flatpak.c
new file mode 100644
index 0000000..91c5098
--- /dev/null
+++ b/lib/flatpak.c
@@ -0,0 +1,3 @@
+#include "config.h"
+
+#include "flatpak-version-macros.h"
diff --git a/lib/xdg-app.h b/lib/flatpak.h
index f1cbee1..08c92b2 100644
--- a/lib/xdg-app.h
+++ b/lib/flatpak.h
@@ -25,15 +25,15 @@
 
 #include <gio/gio.h>
 
-#include <xdg-app-version-macros.h>
-#include <xdg-app-enum-types.h>
-#include <xdg-app-error.h>
-#include <xdg-app-ref.h>
-#include <xdg-app-installed-ref.h>
-#include <xdg-app-remote-ref.h>
-#include <xdg-app-bundle-ref.h>
-#include <xdg-app-remote.h>
-#include <xdg-app-installation.h>
+#include <flatpak-version-macros.h>
+#include <flatpak-enum-types.h>
+#include <flatpak-error.h>
+#include <flatpak-ref.h>
+#include <flatpak-installed-ref.h>
+#include <flatpak-remote-ref.h>
+#include <flatpak-bundle-ref.h>
+#include <flatpak-remote.h>
+#include <flatpak-installation.h>
 
 #undef __FLATPAK_H_INSIDE__
 
diff --git a/lib/test-lib.c b/lib/test-lib.c
index 16599fb..869807e 100644
--- a/lib/test-lib.c
+++ b/lib/test-lib.c
@@ -2,7 +2,7 @@
 
 #include "libglnx/libglnx.h"
 
-#include <xdg-app.h>
+#include <flatpak.h>
 #include <gio/gunixoutputstream.h>
 
 
diff --git a/lib/xdg-app.c b/lib/xdg-app.c
deleted file mode 100644
index 4a71720..0000000
--- a/lib/xdg-app.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "config.h"
-
-#include "xdg-app-version-macros.h"
diff --git a/session-helper/Makefile.am.inc b/session-helper/Makefile.am.inc
index 5782fe3..55f5b02 100644
--- a/session-helper/Makefile.am.inc
+++ b/session-helper/Makefile.am.inc
@@ -9,9 +9,9 @@ service_in_files += session-helper/org.freedesktop.XdgApp.service.in
 dbus_service_DATA += session-helper/org.freedesktop.XdgApp.service
 
 xdg_app_session_helper_SOURCES = \
-	session-helper/xdg-app-session-helper.c	\
-	session-helper/xdg-app-permission-store.c	\
-	session-helper/xdg-app-permission-store.h	\
+	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) libxdgapp-common.la
diff --git a/session-helper/xdg-app-permission-store.c b/session-helper/flatpak-permission-store.c
index 25b3edc..7cab93f 100644
--- a/session-helper/xdg-app-permission-store.c
+++ b/session-helper/flatpak-permission-store.c
@@ -24,9 +24,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <gio/gio.h>
-#include "xdg-app-permission-store.h"
-#include "xdg-app-db.h"
-#include "xdg-app-portal-error.h"
+#include "flatpak-permission-store.h"
+#include "flatpak-db.h"
+#include "flatpak-portal-error.h"
 
 GHashTable *tables = NULL;
 
diff --git a/session-helper/xdg-app-permission-store.h b/session-helper/flatpak-permission-store.h
index eb4f32e..57de5da 100644
--- a/session-helper/xdg-app-permission-store.h
+++ b/session-helper/flatpak-permission-store.h
@@ -21,7 +21,7 @@
 #ifndef __FLATPAK_PERMISSION_STORE_H__
 #define __FLATPAK_PERMISSION_STORE_H__
 
-#include "xdg-app-dbus.h"
+#include "flatpak-dbus.h"
 
 void flatpak_permission_store_start (GDBusConnection *connection);
 
diff --git a/session-helper/xdg-app-session-helper.c b/session-helper/flatpak-session-helper.c
index 1b3682c..d9ba8b3 100644
--- a/session-helper/xdg-app-session-helper.c
+++ b/session-helper/flatpak-session-helper.c
@@ -24,8 +24,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <gio/gio.h>
-#include "xdg-app-dbus.h"
-#include "xdg-app-permission-store.h"
+#include "flatpak-dbus.h"
+#include "flatpak-permission-store.h"
 
 static char *monitor_dir;
 
diff --git a/system-helper/Makefile.am.inc b/system-helper/Makefile.am.inc
index 24bb80d..4a58151 100644
--- a/system-helper/Makefile.am.inc
+++ b/system-helper/Makefile.am.inc
@@ -13,8 +13,8 @@ service_in_files += system-helper/xdg-app-system-helper.service.in
 systemdsystemunit_DATA = system-helper/xdg-app-system-helper.service
 
 xdg_app_system_helper_SOURCES = \
-	system-helper/xdg-app-system-helper.c	\
-	lib/xdg-app-error.c	\
+	system-helper/flatpak-system-helper.c	\
+	lib/flatpak-error.c	\
 	$(NULL)
 
 xdg_app_system_helper_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(POLKIT_LIBS) libxdgapp-common.la
diff --git a/system-helper/xdg-app-system-helper.c b/system-helper/flatpak-system-helper.c
index 608fb6c..44ce798 100644
--- a/system-helper/xdg-app-system-helper.c
+++ b/system-helper/flatpak-system-helper.c
@@ -26,9 +26,9 @@
 #include <gio/gio.h>
 #include <polkit/polkit.h>
 
-#include "xdg-app-dbus.h"
-#include "xdg-app-dir.h"
-#include "lib/xdg-app-error.h"
+#include "flatpak-dbus.h"
+#include "flatpak-dir.h"
+#include "lib/flatpak-error.h"
 
 static PolkitAuthority *authority = NULL;
 
diff --git a/tests/test-doc-portal.c b/tests/test-doc-portal.c
index 101fba3..9d5fa8e 100644
--- a/tests/test-doc-portal.c
+++ b/tests/test-doc-portal.c
@@ -13,7 +13,7 @@
 
 #include "document-portal/xdp-dbus.h"
 
-#include "xdg-app-dbus.h"
+#include "flatpak-dbus.h"
 
 char outdir[] = "/tmp/xdp-test-XXXXXX";
 
diff --git a/tests/testdb.c b/tests/testdb.c
index d5d2cf9..d1f2f5f 100644
--- a/tests/testdb.c
+++ b/tests/testdb.c
@@ -1,7 +1,7 @@
 #include "config.h"
 
 #include <glib.h>
-#include <xdg-app-db.h>
+#include <flatpak-db.h>
 
 /*
 static void