diff --git a/litex/soc/software/bios/Makefile b/litex/soc/software/bios/Makefile
index fe809fe87..24d33a504 100755
--- a/litex/soc/software/bios/Makefile
+++ b/litex/soc/software/bios/Makefile
@@ -19,11 +19,11 @@ OBJECTS = isr.o			\
 	  helpers.o			\
 	  cmd_bios.o		\
 	  cmd_boot.o		\
-	  cmd_dram.o		\
+	  cmd_litedram.o	\
 	  cmd_liteeth.o		\
 	  cmd_mem.o	        \
-	  cmd_sdcard.o		\
-	  cmd_spi_flash.o	\
+	  cmd_litesdcard.o	\
+	  cmd_spiflash.o	\
 
 ifneq "$(or $(TERM_NO_COMPLETE),$(TERM_MINI))" ""
 CFLAGS += -DTERM_NO_COMPLETE
diff --git a/litex/soc/software/bios/commands/cmd_dram.c b/litex/soc/software/bios/commands/cmd_litedram.c
similarity index 99%
rename from litex/soc/software/bios/commands/cmd_dram.c
rename to litex/soc/software/bios/commands/cmd_litedram.c
index 0d6fa1d46..dbca41291 100644
--- a/litex/soc/software/bios/commands/cmd_dram.c
+++ b/litex/soc/software/bios/commands/cmd_litedram.c
@@ -25,7 +25,7 @@ static void sdrrow_handler(int nb_params, char **params)
 		sdrrow(0);
 		printf("Precharged");
 	}
-	
+
 	row = strtoul(params[0], &c, 0);
 	if (*c != 0) {
 		printf("Incorrect row");
diff --git a/litex/soc/software/bios/commands/cmd_sdcard.c b/litex/soc/software/bios/commands/cmd_litesdcard.c
similarity index 100%
rename from litex/soc/software/bios/commands/cmd_sdcard.c
rename to litex/soc/software/bios/commands/cmd_litesdcard.c
diff --git a/litex/soc/software/bios/commands/cmd_spi_flash.c b/litex/soc/software/bios/commands/cmd_spiflash.c
similarity index 100%
rename from litex/soc/software/bios/commands/cmd_spi_flash.c
rename to litex/soc/software/bios/commands/cmd_spiflash.c