diff --git a/Makefile-libostree.am b/Makefile-libostree.am
index af89ce9a..c5c1fb1e 100644
--- a/Makefile-libostree.am
+++ b/Makefile-libostree.am
@@ -53,8 +53,8 @@ CLEANFILES += $(BUILT_SOURCES)
 
 libostree_1_la_SOURCES = \
 	src/libostree/ostree-async-progress.c \
-	src/libostree/ostree-cmdprivate.h \
-	src/libostree/ostree-cmdprivate.c \
+	src/libostree/ostree-cmd-private.h \
+	src/libostree/ostree-cmd-private.c \
 	src/libostree/ostree-core-private.h \
 	src/libostree/ostree-core.c \
 	src/libostree/ostree-date-utils.c \
diff --git a/apidoc/Makefile.am b/apidoc/Makefile.am
index 7b824d5a..80039d1b 100644
--- a/apidoc/Makefile.am
+++ b/apidoc/Makefile.am
@@ -71,7 +71,7 @@ IGNORE_HFILES= \
 	ostree-bootloader-grub2.h \
 	ostree-bootloader-syslinux.h \
 	ostree-bootloader-uboot.h \
-	ostree-cmdprivate.h \
+	ostree-cmd-private.h \
 	ostree-core-private.h \
 	ostree-fetcher.h \
 	ostree-gpg-verifier.h \
diff --git a/src/libostree/ostree-cmdprivate.c b/src/libostree/ostree-cmd-private.c
similarity index 98%
rename from src/libostree/ostree-cmdprivate.c
rename to src/libostree/ostree-cmd-private.c
index f6c114f4..ad820fde 100644
--- a/src/libostree/ostree-cmdprivate.c
+++ b/src/libostree/ostree-cmd-private.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "ostree-cmdprivate.h"
+#include "ostree-cmd-private.h"
 #include "ostree-repo-private.h"
 #include "ostree-core-private.h"
 #include "ostree-repo-static-delta-private.h"
diff --git a/src/libostree/ostree-cmdprivate.h b/src/libostree/ostree-cmd-private.h
similarity index 100%
rename from src/libostree/ostree-cmdprivate.h
rename to src/libostree/ostree-cmd-private.h
diff --git a/src/libostree/ostree-impl-system-generator.c b/src/libostree/ostree-impl-system-generator.c
index 92d71605..da4654b9 100644
--- a/src/libostree/ostree-impl-system-generator.c
+++ b/src/libostree/ostree-impl-system-generator.c
@@ -32,7 +32,7 @@
 
 #include "ostree.h"
 #include "ostree-core-private.h"
-#include "ostree-cmdprivate.h"
+#include "ostree-cmd-private.h"
 
 #ifdef HAVE_LIBMOUNT
 typedef FILE OtLibMountFile;
diff --git a/src/libostree/ostree-repo-static-delta-core.c b/src/libostree/ostree-repo-static-delta-core.c
index 7e6611da..7854211f 100644
--- a/src/libostree/ostree-repo-static-delta-core.c
+++ b/src/libostree/ostree-repo-static-delta-core.c
@@ -25,7 +25,7 @@
 #include "ostree-core-private.h"
 #include "ostree-repo-private.h"
 #include "ostree-lzma-decompressor.h"
-#include "ostree-cmdprivate.h"
+#include "ostree-cmd-private.h"
 #include "ostree-checksum-input-stream.h"
 #include "ostree-repo-static-delta-private.h"
 #include "otutil.h"
diff --git a/src/ostree/ot-admin-builtin-boot-complete.c b/src/ostree/ot-admin-builtin-boot-complete.c
index 6e1052f5..5d50c028 100644
--- a/src/ostree/ot-admin-builtin-boot-complete.c
+++ b/src/ostree/ot-admin-builtin-boot-complete.c
@@ -27,7 +27,7 @@
 #include "ostree.h"
 #include "otutil.h"
 
-#include "ostree-cmdprivate.h"
+#include "ostree-cmd-private.h"
 
 static GOptionEntry options[] = {
   { NULL }
diff --git a/src/ostree/ot-admin-builtin-finalize-staged.c b/src/ostree/ot-admin-builtin-finalize-staged.c
index 17b6a625..eedffdde 100644
--- a/src/ostree/ot-admin-builtin-finalize-staged.c
+++ b/src/ostree/ot-admin-builtin-finalize-staged.c
@@ -29,7 +29,7 @@
 #include "ostree.h"
 #include "otutil.h"
 
-#include "ostree-cmdprivate.h"
+#include "ostree-cmd-private.h"
 #include "ostree.h"
 
 static GOptionEntry options[] = {
diff --git a/src/ostree/ot-admin-instutil-builtin-grub2-generate.c b/src/ostree/ot-admin-instutil-builtin-grub2-generate.c
index af3fa671..d3598460 100644
--- a/src/ostree/ot-admin-instutil-builtin-grub2-generate.c
+++ b/src/ostree/ot-admin-instutil-builtin-grub2-generate.c
@@ -22,7 +22,7 @@
 
 #include "ot-main.h"
 #include "ot-admin-instutil-builtins.h"
-#include "ostree-cmdprivate.h"
+#include "ostree-cmd-private.h"
 
 #include "otutil.h"
 
diff --git a/src/ostree/ot-builtin-fsck.c b/src/ostree/ot-builtin-fsck.c
index 042b157d..9e3f77ef 100644
--- a/src/ostree/ot-builtin-fsck.c
+++ b/src/ostree/ot-builtin-fsck.c
@@ -25,7 +25,7 @@
 #include "ot-main.h"
 #include "ot-builtins.h"
 #include "ostree.h"
-#include "ostree-cmdprivate.h"
+#include "ostree-cmd-private.h"
 #include "otutil.h"
 
 static gboolean opt_quiet;
diff --git a/src/ostree/ot-builtin-static-delta.c b/src/ostree/ot-builtin-static-delta.c
index 99faf861..a5483c17 100644
--- a/src/ostree/ot-builtin-static-delta.c
+++ b/src/ostree/ot-builtin-static-delta.c
@@ -22,7 +22,7 @@
 #include "ot-main.h"
 #include "ot-builtins.h"
 #include "ostree.h"
-#include "ostree-cmdprivate.h"
+#include "ostree-cmd-private.h"
 #include "ot-main.h"
 #include "otutil.h"
 
diff --git a/src/switchroot/ostree-system-generator.c b/src/switchroot/ostree-system-generator.c
index 4b42176f..bd0901bc 100644
--- a/src/switchroot/ostree-system-generator.c
+++ b/src/switchroot/ostree-system-generator.c
@@ -27,7 +27,7 @@
 
 #include <libglnx.h>
 
-#include "ostree-cmdprivate.h"
+#include "ostree-cmd-private.h"
 #include "ostree-mount-util.h"
 
 static const char *arg_dest = "/tmp";