diff --git a/app/Makefile.am.inc b/app/Makefile.am.inc
index 06190433..8493be18 100644
--- a/app/Makefile.am.inc
+++ b/app/Makefile.am.inc
@@ -27,7 +27,7 @@ flatpak_SOURCES = \
 	app/flatpak-builtins-remote-delete.c \
 	app/flatpak-builtins-remote-list.c \
 	app/flatpak-builtins-ls-remote.c \
-	app/flatpak-builtins-info-remote.c \
+	app/flatpak-builtins-remote-info.c \
 	app/flatpak-builtins-install.c \
 	app/flatpak-builtins-override.c \
 	app/flatpak-builtins-make-current.c \
diff --git a/app/flatpak-builtins-info-remote.c b/app/flatpak-builtins-remote-info.c
similarity index 99%
rename from app/flatpak-builtins-info-remote.c
rename to app/flatpak-builtins-remote-info.c
index 64d4a148..860be7f5 100644
--- a/app/flatpak-builtins-info-remote.c
+++ b/app/flatpak-builtins-remote-info.c
@@ -88,7 +88,7 @@ format_timestamp (guint64 timestamp)
 
 
 gboolean
-flatpak_builtin_info_remote (int argc, char **argv, GCancellable *cancellable, GError **error)
+flatpak_builtin_remote_info (int argc, char **argv, GCancellable *cancellable, GError **error)
 {
   g_autoptr(GOptionContext) context = NULL;
   g_autoptr(GPtrArray) dirs = NULL;
@@ -349,7 +349,7 @@ flatpak_builtin_info_remote (int argc, char **argv, GCancellable *cancellable, G
 }
 
 gboolean
-flatpak_complete_info_remote (FlatpakCompletion *completion)
+flatpak_complete_remote_info (FlatpakCompletion *completion)
 {
   g_autoptr(GOptionContext) context = NULL;
   g_autoptr(GPtrArray) dirs = NULL;
diff --git a/app/flatpak-builtins.h b/app/flatpak-builtins.h
index 925be742..e0726da3 100644
--- a/app/flatpak-builtins.h
+++ b/app/flatpak-builtins.h
@@ -63,7 +63,7 @@ BUILTINPROTO (add_remote)
 BUILTINPROTO (modify_remote)
 BUILTINPROTO (remote_delete)
 BUILTINPROTO (ls_remote)
-BUILTINPROTO (info_remote)
+BUILTINPROTO (remote_info)
 BUILTINPROTO (remote_list)
 BUILTINPROTO (install)
 BUILTINPROTO (update)
diff --git a/app/flatpak-main.c b/app/flatpak-main.c
index b1ace066..d781773c 100644
--- a/app/flatpak-main.c
+++ b/app/flatpak-main.c
@@ -105,7 +105,7 @@ static FlatpakCommand commands[] = {
   { "remote-delete", N_("Delete a configured remote"), flatpak_builtin_remote_delete, flatpak_complete_remote_delete },
   { "remote-list", NULL, flatpak_builtin_remote_list, flatpak_complete_remote_list, TRUE },
   { "remote-ls", N_("List contents of a configured remote"), flatpak_builtin_ls_remote, flatpak_complete_ls_remote },
-  { "remote-info", N_("Show information about a remote app or runtime"), flatpak_builtin_info_remote, flatpak_complete_info_remote },
+  { "remote-info", N_("Show information about a remote app or runtime"), flatpak_builtin_remote_info, flatpak_complete_remote_info },
 
   /* translators: please keep the leading newline and space */
   { N_("\n Build applications") },