diff --git a/Makefile.am b/Makefile.am
index b73c3571..22b3bcf2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,9 +28,9 @@ xdg_app_helper_SOURCES = xdg-app-helper.c
 xdg_app_SOURCES = \
 	xdg-app-main.c \
 	xdg-app-builtins.h \
-	xdg-app-builtins-add-repo.c \
-	xdg-app-builtins-delete-repo.c \
-	xdg-app-builtins-list-repos.c \
+	xdg-app-builtins-add-remote.c \
+	xdg-app-builtins-delete-remote.c \
+	xdg-app-builtins-list-remotes.c \
 	xdg-app-builtins-repo-contents.c \
 	xdg-app-builtins-install.c \
 	xdg-app-builtins-update.c \
diff --git a/doc/Makefile.am b/doc/Makefile.am
index bfb106cb..c1cc5438 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -14,9 +14,9 @@ XSLTPROC_FLAGS = \
 
 man_MANS = \
 	xdg-app.1			\
-	xdg-app-add-repo.1 		\
-	xdg-app-delete-repo.1 		\
-	xdg-app-list-repos.1 		\
+	xdg-app-add-remote.1 		\
+	xdg-app-delete-remote.1		\
+	xdg-app-list-remotes.1 		\
 	xdg-app-repo-contents.1		\
 	xdg-app-install-runtime.1 	\
 	xdg-app-update-runtime.1 	\
diff --git a/doc/xdg-app-add-repo.xml b/doc/xdg-app-add-remote.xml
similarity index 84%
rename from doc/xdg-app-add-repo.xml
rename to doc/xdg-app-add-remote.xml
index 0d243ad8..ba462920 100644
--- a/doc/xdg-app-add-repo.xml
+++ b/doc/xdg-app-add-remote.xml
@@ -2,10 +2,10 @@
 <!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-add-repo">
+<refentry id="xdg-app-add-remote">
 
     <refentryinfo>
-        <title>xdg-app add-repo</title>
+        <title>xdg-app add-remote</title>
         <productname>xdg-app</productname>
 
         <authorgroup>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app add-repo</refentrytitle>
+        <refentrytitle>xdg-app add-remote</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-add-repo</refname>
+        <refname>xdg-app-add-remote</refname>
         <refpurpose>Add a remote repository</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app add-repo</command>
+                <command>xdg-app add-remote</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="plain">NAME</arg>
                 <arg choice="plain">URL</arg>
@@ -111,7 +111,7 @@
         <title>Examples</title>
 
         <para>
-            <command>$ xdg-app --user add-repo --no-gpg-verify test-repo https://people.gnome.org/~alexl/gnome-sdk/repo/</command>
+            <command>$ xdg-app --user add-remote --no-gpg-verify test-repo https://people.gnome.org/~alexl/gnome-sdk/repo/</command>
         </para>
     </refsect1>
 
@@ -120,8 +120,8 @@
 
             <para>
                 <citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                <citerefentry><refentrytitle>xdg-app-delete-repo</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                <citerefentry><refentrytitle>xdg-app-list-repos</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>
             </para>
     </refsect1>
 
diff --git a/doc/xdg-app-delete-repo.xml b/doc/xdg-app-delete-remote.xml
similarity index 82%
rename from doc/xdg-app-delete-repo.xml
rename to doc/xdg-app-delete-remote.xml
index 3d98e4d6..eec78525 100644
--- a/doc/xdg-app-delete-repo.xml
+++ b/doc/xdg-app-delete-remote.xml
@@ -2,10 +2,10 @@
 <!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-add-repo">
+<refentry id="xdg-app-delete-remote">
 
     <refentryinfo>
-        <title>xdg-app delete-repo</title>
+        <title>xdg-app delete-remote</title>
         <productname>xdg-app</productname>
 
         <authorgroup>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app delete-repo</refentrytitle>
+        <refentrytitle>xdg-app delete-remote</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-delete-repo</refname>
+        <refname>xdg-app-delete-remote</refname>
         <refpurpose>Delete a remote repository</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app delete-repo</command>
+                <command>xdg-app delete-remote</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="plain">NAME</arg>
             </cmdsynopsis>
@@ -93,7 +93,7 @@
         <title>Examples</title>
 
         <para>
-            <command>$ xdg-app --user delete-repo dried-raisins</command>
+            <command>$ xdg-app --user delete-remote dried-raisins</command>
         </para>
     </refsect1>
 
@@ -102,8 +102,8 @@
 
             <para>
                 <citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                <citerefentry><refentrytitle>xdg-app-add-repo</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                <citerefentry><refentrytitle>xdg-app-list-repos</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <citerefentry><refentrytitle>xdg-app-add-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                <citerefentry><refentrytitle>xdg-app-list-remotes</refentrytitle><manvolnum>1</manvolnum></citerefentry>
             </para>
     </refsect1>
 
diff --git a/doc/xdg-app-list-repos.xml b/doc/xdg-app-list-remotes.xml
similarity index 83%
rename from doc/xdg-app-list-repos.xml
rename to doc/xdg-app-list-remotes.xml
index 419b6296..8f5bc259 100644
--- a/doc/xdg-app-list-repos.xml
+++ b/doc/xdg-app-list-remotes.xml
@@ -2,10 +2,10 @@
 <!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-repos">
+<refentry id="xdg-app-list-remotes">
 
     <refentryinfo>
-        <title>xdg-app list-repos</title>
+        <title>xdg-app list-remotes</title>
         <productname>xdg-app</productname>
 
         <authorgroup>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app list-repos</refentrytitle>
+        <refentrytitle>xdg-app list-remotes</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-list-repos</refname>
+        <refname>xdg-app-list-remotes</refname>
         <refpurpose>List remote repositories</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app list-repos</command>
+                <command>xdg-app list-remotes</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
@@ -99,7 +99,7 @@
         <title>Examples</title>
 
         <para>
-            <command>$ xdg-app list-repos --user --show-urls</command>
+            <command>$ xdg-app list-remotes --user --show-urls</command>
         </para>
 <programlisting>
 testrepo  http://209.132.179.91/repo/
@@ -111,8 +111,8 @@ testrepo  http://209.132.179.91/repo/
 
             <para>
                 <citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                <citerefentry><refentrytitle>xdg-app-add-repo</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                <citerefentry><refentrytitle>xdg-app-delete-repo</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>
             </para>
     </refsect1>
 
diff --git a/doc/xdg-app.xml b/doc/xdg-app.xml
index 5905237d..c9350fd4 100644
--- a/doc/xdg-app.xml
+++ b/doc/xdg-app.xml
@@ -107,21 +107,21 @@
 
         <variablelist>
             <varlistentry>
-                <term><citerefentry><refentrytitle>xdg-app-add-repo</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+                <term><citerefentry><refentrytitle>xdg-app-add-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     Add a remote repository.
                 </para></listitem>
             </varlistentry>
             <varlistentry>
-                <term><citerefentry><refentrytitle>xdg-app-delete-repo</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+                <term><citerefentry><refentrytitle>xdg-app-delete-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     Delete a remote repository.
                 </para></listitem>
             </varlistentry>
             <varlistentry>
-                <term><citerefentry><refentrytitle>xdg-app-list-repos</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+                <term><citerefentry><refentrytitle>xdg-app-list-remotes</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     Lists remote repositories.
diff --git a/xdg-app-builtins-add-repo.c b/xdg-app-builtins-add-remote.c
similarity index 95%
rename from xdg-app-builtins-add-repo.c
rename to xdg-app-builtins-add-remote.c
index 1e3e3af7..2164803d 100644
--- a/xdg-app-builtins-add-repo.c
+++ b/xdg-app-builtins-add-remote.c
@@ -18,7 +18,7 @@ static GOptionEntry options[] = {
 };
 
 gboolean
-xdg_app_builtin_add_repo (int argc, char **argv, GCancellable *cancellable, GError **error)
+xdg_app_builtin_add_remote (int argc, char **argv, GCancellable *cancellable, GError **error)
 {
   GOptionContext *context;
   gboolean ret = FALSE;
diff --git a/xdg-app-builtins-delete-repo.c b/xdg-app-builtins-delete-remote.c
similarity index 90%
rename from xdg-app-builtins-delete-repo.c
rename to xdg-app-builtins-delete-remote.c
index 413bee0a..810f280a 100644
--- a/xdg-app-builtins-delete-repo.c
+++ b/xdg-app-builtins-delete-remote.c
@@ -9,7 +9,7 @@
 #include "xdg-app-builtins.h"
 
 gboolean
-xdg_app_builtin_delete_repo (int argc, char **argv, GCancellable *cancellable, GError **error)
+xdg_app_builtin_delete_remote (int argc, char **argv, GCancellable *cancellable, GError **error)
 {
   GOptionContext *context;
   gboolean ret = FALSE;
diff --git a/xdg-app-builtins-list-repos.c b/xdg-app-builtins-list-remotes.c
similarity index 93%
rename from xdg-app-builtins-list-repos.c
rename to xdg-app-builtins-list-remotes.c
index f3806566..b4edd518 100644
--- a/xdg-app-builtins-list-repos.c
+++ b/xdg-app-builtins-list-remotes.c
@@ -17,7 +17,7 @@ static GOptionEntry options[] = {
 };
 
 gboolean
-xdg_app_builtin_list_repos (int argc, char **argv, GCancellable *cancellable, GError **error)
+xdg_app_builtin_list_remotes (int argc, char **argv, GCancellable *cancellable, GError **error)
 {
   GOptionContext *context;
   gboolean ret = FALSE;
diff --git a/xdg-app-builtins.h b/xdg-app-builtins.h
index b19b6087..2042be3d 100644
--- a/xdg-app-builtins.h
+++ b/xdg-app-builtins.h
@@ -28,9 +28,9 @@ void usage_error (GOptionContext *context,
 
 #define BUILTINPROTO(name) gboolean xdg_app_builtin_ ## name (int argc, char **argv, GCancellable *cancellable, GError **error)
 
-BUILTINPROTO(add_repo);
-BUILTINPROTO(delete_repo);
-BUILTINPROTO(list_repos);
+BUILTINPROTO(add_remote);
+BUILTINPROTO(delete_remote);
+BUILTINPROTO(list_remotes);
 BUILTINPROTO(repo_contents);
 BUILTINPROTO(install_runtime);
 BUILTINPROTO(update_runtime);
diff --git a/xdg-app-main.c b/xdg-app-main.c
index ce387006..6fca4ca8 100644
--- a/xdg-app-main.c
+++ b/xdg-app-main.c
@@ -19,9 +19,9 @@ typedef struct {
 } XdgAppCommand;
 
 static XdgAppCommand commands[] = {
-  { "add-repo", xdg_app_builtin_add_repo },
-  { "delete-repo", xdg_app_builtin_delete_repo },
-  { "list-repos", xdg_app_builtin_list_repos },
+  { "add-remote", xdg_app_builtin_add_remote },
+  { "delete-remote", xdg_app_builtin_delete_remote },
+  { "list-remotes", xdg_app_builtin_list_remotes },
   { "repo-contents", xdg_app_builtin_repo_contents },
   { "install-runtime", xdg_app_builtin_install_runtime },
   { "update-runtime", xdg_app_builtin_update_runtime },