diff --git a/Makefile b/Makefile
index 122a5b7b..e94e6f00 100644
--- a/Makefile
+++ b/Makefile
@@ -135,13 +135,13 @@ objects = ctree.o disk-io.o kernel-lib/radix-tree.o extent-tree.o print-tree.o \
 	  inode.o file.o find-root.o free-space-tree.o help.o send-dump.o \
 	  fsfeatures.o kernel-lib/tables.o kernel-lib/raid56.o transaction.o \
 	  delayed-ref.o
-cmds_objects = cmds/subvolume.o cmds-filesystem.o cmds/device.o cmds/scrub.o \
+cmds_objects = cmds/subvolume.o cmds/filesystem.o cmds/device.o cmds/scrub.o \
 	       cmds/inspect.o cmds/balance.o cmds-send.o cmds/receive.o \
 	       cmds/quota.o cmds/qgroup.o cmds/replace.o check/main.o \
 	       cmds/restore.o cmds/rescue.o cmds/rescue-chunk-recover.o \
 	       cmds/rescue-super-recover.o \
-	       cmds/property.o cmds-fi-usage.o cmds/inspect-dump-tree.o \
-	       cmds/inspect-dump-super.o cmds/inspect-tree-stats.o cmds-fi-du.o \
+	       cmds/property.o cmds/filesystem-usage.o cmds/inspect-dump-tree.o \
+	       cmds/inspect-dump-super.o cmds/inspect-tree-stats.o cmds/filesystem-du.o \
 	       mkfs/common.o check/mode-common.o check/mode-lowmem.o
 libbtrfs_objects = send-stream.o send-utils.o kernel-lib/rbtree.o btrfs-list.o \
 		   kernel-lib/crc32c.o messages.o \
diff --git a/cmds/device.c b/cmds/device.c
index 5028aac6..80275058 100644
--- a/cmds/device.c
+++ b/cmds/device.c
@@ -29,7 +29,7 @@
 #include "ioctl.h"
 #include "utils.h"
 #include "volumes.h"
-#include "cmds-fi-usage.h"
+#include "cmds/filesystem-usage.h"
 
 #include "commands.h"
 #include "help.h"
diff --git a/cmds-fi-du.c b/cmds/filesystem-du.c
similarity index 100%
rename from cmds-fi-du.c
rename to cmds/filesystem-du.c
diff --git a/cmds-fi-usage.c b/cmds/filesystem-usage.c
similarity index 99%
rename from cmds-fi-usage.c
rename to cmds/filesystem-usage.c
index 66c28e79..e5331bb1 100644
--- a/cmds-fi-usage.c
+++ b/cmds/filesystem-usage.c
@@ -28,7 +28,7 @@
 #include "kerncompat.h"
 #include "ctree.h"
 #include "string-table.h"
-#include "cmds-fi-usage.h"
+#include "cmds/filesystem-usage.h"
 #include "commands.h"
 #include "disk-io.h"
 
diff --git a/cmds-fi-usage.h b/cmds/filesystem-usage.h
similarity index 100%
rename from cmds-fi-usage.h
rename to cmds/filesystem-usage.h
diff --git a/cmds-filesystem.c b/cmds/filesystem.c
similarity index 99%
rename from cmds-filesystem.c
rename to cmds/filesystem.c
index f6e3edee..2afc21d4 100644
--- a/cmds-filesystem.c
+++ b/cmds/filesystem.c
@@ -36,7 +36,7 @@
 #include "utils.h"
 #include "volumes.h"
 #include "commands.h"
-#include "cmds-fi-usage.h"
+#include "cmds/filesystem-usage.h"
 #include "list_sort.h"
 #include "disk-io.h"
 #include "help.h"