Rename everything but the on-disk location to flatpak

9 files changed, 19 insertions, 19 deletions

diff --git a/lib/flatpak-error.c b/lib/flatpak-error.c
index 806fbe9..c2b550b 100644
--- a/lib/flatpak-error.c
+++ b/lib/flatpak-error.c
@@ -1,4 +1,4 @@
-/* xdg-app-error.c
+/* flatpak-error.c
  *
  * Copyright (C) 2015 Red Hat, Inc
  *
@@ -26,9 +26,9 @@
 #include <gio/gio.h>
 
 /**
- * SECTION:xdg-app-error
+ * SECTION:flatpak-error
  * @Title: Error codes
  *
  */
 
-G_DEFINE_QUARK (xdg - app - error - quark, flatpak_error)
+G_DEFINE_QUARK (flatpak-error-quark, flatpak_error)
diff --git a/lib/flatpak-error.h b/lib/flatpak-error.h
index 9c7b593..58380e1 100644
--- a/lib/flatpak-error.h
+++ b/lib/flatpak-error.h
@@ -1,4 +1,4 @@
-/* xdg-app-error.c
+/* flatpak-error.c
  *
  * Copyright (C) 2015 Red Hat, Inc
  *
diff --git a/lib/flatpak-installation.c b/lib/flatpak-installation.c
index 5e9d949..40ba33c 100644
--- a/lib/flatpak-installation.c
+++ b/lib/flatpak-installation.c
@@ -34,15 +34,15 @@
 #include "flatpak-error.h"
 
 /**
- * SECTION:xdg-app-installation
+ * SECTION:flatpak-installation
  * @Title: FlatpakInstallation
  * @Short_description: Installation information
  *
  * FlatpakInstallation is the toplevel object that software installers
- * should use to operate on an xdg-apps.
+ * should use to operate on an flatpak applications.
  *
  * An FlatpakInstallation object provides information about an installation
- * location for xdg-app applications. Typical installation locations are either
+ * location for flatpak applications. Typical installation locations are either
  * system-wide (in /var/lib/xdg-app) or per-user (in ~/.local/share/xdg-app).
  *
  * FlatpakInstallation can list configured remotes as well as installed application
@@ -804,14 +804,14 @@ progress_cb (OstreeAsyncProgress *progress, gpointer user_data)
 /**
  * flatpak_installation_install_bundle:
  * @self: a #FlatpakInstallation
- * @file: a #GFile that is an xdg-app bundle
+ * @file: a #GFile that is an flatpak bundle
  * @progress: (scope call): progress callback
  * @progress_data: user data passed to @progress
  * @cancellable: (nullable): a #GCancellable
  * @error: return location for a #GError
  *
- * Install an application or runtime from an xdg-app bundle file.
- * See xdg-app-build-bundle(1) for how to create brundles.
+ * Install an application or runtime from an flatpak bundle file.
+ * See flatpak-build-bundle(1) for how to create brundles.
  *
  * Returns: (transfer full): The ref for the newly installed app or %NULL on failure
  */
@@ -1273,7 +1273,7 @@ flatpak_installation_fetch_remote_size_sync2 (FlatpakInstallation *self,
  *
  * This is deprecated, use flatpak_installation_fetch_remote_metadata_sync2
  *
- * Returns: (transfer full): a #GBytes containing the xdg-app metadata file,
+ * Returns: (transfer full): a #GBytes containing the flatpak metadata file,
  *   or %NULL if an error occurred
  */
 GBytes *
@@ -1308,7 +1308,7 @@ flatpak_installation_fetch_remote_metadata_sync (FlatpakInstallation *self,
  *
  * Obtains the metadata file from a commit.
  *
- * Returns: (transfer full): a #GBytes containing the xdg-app metadata file,
+ * Returns: (transfer full): a #GBytes containing the flatpak metadata file,
  *   or %NULL if an error occurred
  */
 GBytes *
diff --git a/lib/flatpak-installed-ref.c b/lib/flatpak-installed-ref.c
index 4915064..9e26394 100644
--- a/lib/flatpak-installed-ref.c
+++ b/lib/flatpak-installed-ref.c
@@ -27,7 +27,7 @@
 #include "flatpak-enum-types.h"
 
 /**
- * SECTION:xdg-app-installed-ref
+ * SECTION:flatpak-installed-ref
  * @Title: FlatpakInstalledRef
  * @Short_description: Installed application reference
  *
diff --git a/lib/flatpak-ref.c b/lib/flatpak-ref.c
index 686940b..ba28b07 100644
--- a/lib/flatpak-ref.c
+++ b/lib/flatpak-ref.c
@@ -25,11 +25,11 @@
 #include "flatpak-enum-types.h"
 
 /**
- * SECTION:xdg-app-ref
+ * SECTION:flatpak-ref
  * @Title: FlatpakRef
  * @Short_description: Application reference
  *
- * Currently xdg-app manages two types of binary artifacts: applications, and
+ * Currently flatpak manages two types of binary artifacts: applications, and
  * runtimes. Applications contain a program that desktop users can run, while
  * runtimes contain only libraries and data. An FlatpakRef object (or short: ref)
  * can refer to either of these.
diff --git a/lib/flatpak-remote-ref.c b/lib/flatpak-remote-ref.c
index bfaad1b..a62565a 100644
--- a/lib/flatpak-remote-ref.c
+++ b/lib/flatpak-remote-ref.c
@@ -28,7 +28,7 @@
 #include "flatpak-enum-types.h"
 
 /**
- * SECTION:xdg-app-remote-ref
+ * SECTION:flatpak-remote-ref
  * @Title: FlatpakRemoteRef
  * @Short_description: Remote application reference
  *
diff --git a/lib/flatpak-remote.c b/lib/flatpak-remote.c
index 1e1528a..6a860c5 100644
--- a/lib/flatpak-remote.c
+++ b/lib/flatpak-remote.c
@@ -28,7 +28,7 @@
 #include <string.h>
 
 /**
- * SECTION:xdg-app-remote
+ * SECTION:flatpak-remote
  * @Short_description: Remote repository
  * @Title: FlatpakRemote
  *
diff --git a/lib/flatpak-version-macros.h.in b/lib/flatpak-version-macros.h.in
index c010a5c..21e858a 100644
--- a/lib/flatpak-version-macros.h.in
+++ b/lib/flatpak-version-macros.h.in
@@ -34,7 +34,7 @@
 #endif
 
 /**
- * SECTION:xdg-app-version-macros
+ * SECTION:flatpak-version-macros
  * @Title: Version information
  */
 
diff --git a/lib/test-lib.c b/lib/test-lib.c
index 869807e..bd6f448 100644
--- a/lib/test-lib.c
+++ b/lib/test-lib.c
@@ -92,7 +92,7 @@ main (int argc, char *argv[])
 
   g_print ("\n**** Loading bundle\n");
   {
-    g_autoptr(GFile) f = g_file_new_for_commandline_arg ("tests/hello.xdgapp");
+    g_autoptr(GFile) f = g_file_new_for_commandline_arg ("tests/hello.pak");
     g_autoptr(FlatpakBundleRef) bundle = flatpak_bundle_ref_new (f, &error);
     if (bundle == NULL)
       {