diff --git a/cmd/Makefile b/cmd/Makefile
index 880a886..03f7e0a 100644
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -7,160 +7,160 @@
 
 ifndef CONFIG_SPL_BUILD
 # core command
-obj-y += cmd_boot.o
-obj-$(CONFIG_CMD_BOOTM) += cmd_bootm.o
-obj-y += cmd_help.o
-obj-y += cmd_version.o
+obj-y += boot.o
+obj-$(CONFIG_CMD_BOOTM) += bootm.o
+obj-y += help.o
+obj-y += version.o
 
 # command
-obj-$(CONFIG_CMD_AES) += cmd_aes.o
-obj-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o
-obj-$(CONFIG_CMD_ARMFLASH) += cmd_armflash.o
-obj-$(CONFIG_SOURCE) += cmd_source.o
-obj-$(CONFIG_CMD_SOURCE) += cmd_source.o
-obj-$(CONFIG_CMD_BDI) += cmd_bdinfo.o
-obj-$(CONFIG_CMD_BEDBUG) += cmd_bedbug.o
-obj-$(CONFIG_CMD_BMP) += cmd_bmp.o
-obj-$(CONFIG_CMD_BOOTMENU) += cmd_bootmenu.o
-obj-$(CONFIG_CMD_BOOTLDR) += cmd_bootldr.o
-obj-$(CONFIG_CMD_BOOTSTAGE) += cmd_bootstage.o
-obj-$(CONFIG_CMD_CACHE) += cmd_cache.o
-obj-$(CONFIG_CMD_CBFS) += cmd_cbfs.o
-obj-$(CONFIG_CMD_CLK) += cmd_clk.o
-obj-$(CONFIG_CMD_CONSOLE) += cmd_console.o
-obj-$(CONFIG_CMD_CPLBINFO) += cmd_cplbinfo.o
-obj-$(CONFIG_CMD_CPU) += cmd_cpu.o
-obj-$(CONFIG_DATAFLASH_MMC_SELECT) += cmd_dataflash_mmc_mux.o
-obj-$(CONFIG_CMD_DATE) += cmd_date.o
-obj-$(CONFIG_CMD_DEMO) += cmd_demo.o
-obj-$(CONFIG_CMD_SOUND) += cmd_sound.o
+obj-$(CONFIG_CMD_AES) += aes.o
+obj-$(CONFIG_CMD_AMBAPP) += ambapp.o
+obj-$(CONFIG_CMD_ARMFLASH) += armflash.o
+obj-$(CONFIG_SOURCE) += source.o
+obj-$(CONFIG_CMD_SOURCE) += source.o
+obj-$(CONFIG_CMD_BDI) += bdinfo.o
+obj-$(CONFIG_CMD_BEDBUG) += bedbug.o
+obj-$(CONFIG_CMD_BMP) += bmp.o
+obj-$(CONFIG_CMD_BOOTMENU) += bootmenu.o
+obj-$(CONFIG_CMD_BOOTLDR) += bootldr.o
+obj-$(CONFIG_CMD_BOOTSTAGE) += bootstage.o
+obj-$(CONFIG_CMD_CACHE) += cache.o
+obj-$(CONFIG_CMD_CBFS) += cbfs.o
+obj-$(CONFIG_CMD_CLK) += clk.o
+obj-$(CONFIG_CMD_CONSOLE) += console.o
+obj-$(CONFIG_CMD_CPLBINFO) += cplbinfo.o
+obj-$(CONFIG_CMD_CPU) += cpu.o
+obj-$(CONFIG_DATAFLASH_MMC_SELECT) += dataflash_mmc_mux.o
+obj-$(CONFIG_CMD_DATE) += date.o
+obj-$(CONFIG_CMD_DEMO) += demo.o
+obj-$(CONFIG_CMD_SOUND) += sound.o
 ifdef CONFIG_4xx
-obj-$(CONFIG_CMD_SETGETDCR) += cmd_dcr.o
+obj-$(CONFIG_CMD_SETGETDCR) += dcr.o
 endif
 ifdef CONFIG_POST
-obj-$(CONFIG_CMD_DIAG) += cmd_diag.o
+obj-$(CONFIG_CMD_DIAG) += diag.o
 endif
-obj-$(CONFIG_CMD_DISPLAY) += cmd_display.o
-obj-$(CONFIG_CMD_DTT) += cmd_dtt.o
-obj-$(CONFIG_CMD_ECHO) += cmd_echo.o
-obj-$(CONFIG_ENV_IS_IN_EEPROM) += cmd_eeprom.o
-obj-$(CONFIG_CMD_EEPROM) += cmd_eeprom.o
-obj-$(CONFIG_EFI_STUB) += cmd_efi.o
-obj-$(CONFIG_CMD_ELF) += cmd_elf.o
-obj-$(CONFIG_SYS_HUSH_PARSER) += cmd_exit.o
-obj-$(CONFIG_CMD_EXT4) += cmd_ext4.o
-obj-$(CONFIG_CMD_EXT2) += cmd_ext2.o
-obj-$(CONFIG_CMD_FAT) += cmd_fat.o
-obj-$(CONFIG_CMD_FDC) += cmd_fdc.o
-obj-$(CONFIG_OF_LIBFDT) += cmd_fdt.o
-obj-$(CONFIG_CMD_FITUPD) += cmd_fitupd.o
-obj-$(CONFIG_CMD_FLASH) += cmd_flash.o
+obj-$(CONFIG_CMD_DISPLAY) += display.o
+obj-$(CONFIG_CMD_DTT) += dtt.o
+obj-$(CONFIG_CMD_ECHO) += echo.o
+obj-$(CONFIG_ENV_IS_IN_EEPROM) += eeprom.o
+obj-$(CONFIG_CMD_EEPROM) += eeprom.o
+obj-$(CONFIG_EFI_STUB) += efi.o
+obj-$(CONFIG_CMD_ELF) += elf.o
+obj-$(CONFIG_SYS_HUSH_PARSER) += exit.o
+obj-$(CONFIG_CMD_EXT4) += ext4.o
+obj-$(CONFIG_CMD_EXT2) += ext2.o
+obj-$(CONFIG_CMD_FAT) += fat.o
+obj-$(CONFIG_CMD_FDC) += fdc.o
+obj-$(CONFIG_OF_LIBFDT) += fdt.o
+obj-$(CONFIG_CMD_FITUPD) += fitupd.o
+obj-$(CONFIG_CMD_FLASH) += flash.o
 ifdef CONFIG_FPGA
-obj-$(CONFIG_CMD_FPGA) += cmd_fpga.o
+obj-$(CONFIG_CMD_FPGA) += fpga.o
 endif
-obj-$(CONFIG_CMD_FPGAD) += cmd_fpgad.o
-obj-$(CONFIG_CMD_FS_GENERIC) += cmd_fs.o
-obj-$(CONFIG_CMD_FUSE) += cmd_fuse.o
-obj-$(CONFIG_CMD_GETTIME) += cmd_gettime.o
-obj-$(CONFIG_CMD_GPIO) += cmd_gpio.o
-obj-$(CONFIG_CMD_I2C) += cmd_i2c.o
-obj-$(CONFIG_CMD_IOTRACE) += cmd_iotrace.o
-obj-$(CONFIG_CMD_HASH) += cmd_hash.o
-obj-$(CONFIG_CMD_IDE) += cmd_ide.o
-obj-$(CONFIG_CMD_IMMAP) += cmd_immap.o
-obj-$(CONFIG_CMD_INI) += cmd_ini.o
-obj-$(CONFIG_CMD_IRQ) += cmd_irq.o
-obj-$(CONFIG_CMD_ITEST) += cmd_itest.o
-obj-$(CONFIG_CMD_JFFS2) += cmd_jffs2.o
-obj-$(CONFIG_CMD_CRAMFS) += cmd_cramfs.o
-obj-$(CONFIG_CMD_LDRINFO) += cmd_ldrinfo.o
-obj-$(CONFIG_CMD_LED) += cmd_led.o
-obj-$(CONFIG_CMD_LICENSE) += cmd_license.o
-obj-y += cmd_load.o
-obj-$(CONFIG_LOGBUFFER) += cmd_log.o
-obj-$(CONFIG_ID_EEPROM) += cmd_mac.o
-obj-$(CONFIG_CMD_MD5SUM) += cmd_md5sum.o
-obj-$(CONFIG_CMD_MEMORY) += cmd_mem.o
-obj-$(CONFIG_CMD_IO) += cmd_io.o
-obj-$(CONFIG_CMD_MFSL) += cmd_mfsl.o
-obj-$(CONFIG_CMD_MII) += cmd_mii.o
+obj-$(CONFIG_CMD_FPGAD) += fpgad.o
+obj-$(CONFIG_CMD_FS_GENERIC) += fs.o
+obj-$(CONFIG_CMD_FUSE) += fuse.o
+obj-$(CONFIG_CMD_GETTIME) += gettime.o
+obj-$(CONFIG_CMD_GPIO) += gpio.o
+obj-$(CONFIG_CMD_I2C) += i2c.o
+obj-$(CONFIG_CMD_IOTRACE) += iotrace.o
+obj-$(CONFIG_CMD_HASH) += hash.o
+obj-$(CONFIG_CMD_IDE) += ide.o
+obj-$(CONFIG_CMD_IMMAP) += immap.o
+obj-$(CONFIG_CMD_INI) += ini.o
+obj-$(CONFIG_CMD_IRQ) += irq.o
+obj-$(CONFIG_CMD_ITEST) += itest.o
+obj-$(CONFIG_CMD_JFFS2) += jffs2.o
+obj-$(CONFIG_CMD_CRAMFS) += cramfs.o
+obj-$(CONFIG_CMD_LDRINFO) += ldrinfo.o
+obj-$(CONFIG_CMD_LED) += led.o
+obj-$(CONFIG_CMD_LICENSE) += license.o
+obj-y += load.o
+obj-$(CONFIG_LOGBUFFER) += log.o
+obj-$(CONFIG_ID_EEPROM) += mac.o
+obj-$(CONFIG_CMD_MD5SUM) += md5sum.o
+obj-$(CONFIG_CMD_MEMORY) += mem.o
+obj-$(CONFIG_CMD_IO) += io.o
+obj-$(CONFIG_CMD_MFSL) += mfsl.o
+obj-$(CONFIG_CMD_MII) += mii.o
 ifdef CONFIG_PHYLIB
-obj-$(CONFIG_CMD_MII) += cmd_mdio.o
+obj-$(CONFIG_CMD_MII) += mdio.o
 endif
-obj-$(CONFIG_CMD_MISC) += cmd_misc.o
-obj-$(CONFIG_CMD_MMC) += cmd_mmc.o
-obj-$(CONFIG_CMD_MMC_SPI) += cmd_mmc_spi.o
-obj-$(CONFIG_MP) += cmd_mp.o
-obj-$(CONFIG_CMD_MTDPARTS) += cmd_mtdparts.o
-obj-$(CONFIG_CMD_NAND) += cmd_nand.o
-obj-$(CONFIG_CMD_NET) += cmd_net.o
-obj-$(CONFIG_CMD_ONENAND) += cmd_onenand.o
-obj-$(CONFIG_CMD_OTP) += cmd_otp.o
-obj-$(CONFIG_CMD_PART) += cmd_part.o
+obj-$(CONFIG_CMD_MISC) += misc.o
+obj-$(CONFIG_CMD_MMC) += mmc.o
+obj-$(CONFIG_CMD_MMC_SPI) += mmc_spi.o
+obj-$(CONFIG_MP) += mp.o
+obj-$(CONFIG_CMD_MTDPARTS) += mtdparts.o
+obj-$(CONFIG_CMD_NAND) += nand.o
+obj-$(CONFIG_CMD_NET) += net.o
+obj-$(CONFIG_CMD_ONENAND) += onenand.o
+obj-$(CONFIG_CMD_OTP) += otp.o
+obj-$(CONFIG_CMD_PART) += part.o
 ifdef CONFIG_PCI
-obj-$(CONFIG_CMD_PCI) += cmd_pci.o
+obj-$(CONFIG_CMD_PCI) += pci.o
 endif
-obj-y += cmd_pcmcia.o
-obj-$(CONFIG_CMD_PORTIO) += cmd_portio.o
-obj-$(CONFIG_CMD_PXE) += cmd_pxe.o
-obj-$(CONFIG_CMD_READ) += cmd_read.o
-obj-$(CONFIG_CMD_REGINFO) += cmd_reginfo.o
-obj-$(CONFIG_CMD_REISER) += cmd_reiser.o
-obj-$(CONFIG_CMD_REMOTEPROC) += cmd_remoteproc.o
-obj-$(CONFIG_SANDBOX) += cmd_host.o
-obj-$(CONFIG_CMD_SATA) += cmd_sata.o
-obj-$(CONFIG_CMD_SF) += cmd_sf.o
-obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o
-obj-$(CONFIG_CMD_SHA1SUM) += cmd_sha1sum.o
-obj-$(CONFIG_CMD_SETEXPR) += cmd_setexpr.o
-obj-$(CONFIG_CMD_SOFTSWITCH) += cmd_softswitch.o
-obj-$(CONFIG_CMD_SPI) += cmd_spi.o
-obj-$(CONFIG_CMD_SPIBOOTLDR) += cmd_spibootldr.o
-obj-$(CONFIG_CMD_STRINGS) += cmd_strings.o
-obj-$(CONFIG_CMD_TERMINAL) += cmd_terminal.o
-obj-$(CONFIG_CMD_TIME) += cmd_time.o
-obj-$(CONFIG_CMD_TRACE) += cmd_trace.o
-obj-$(CONFIG_SYS_HUSH_PARSER) += cmd_test.o
-obj-$(CONFIG_CMD_TPM) += cmd_tpm.o
-obj-$(CONFIG_CMD_TPM_TEST) += cmd_tpm_test.o
-obj-$(CONFIG_CMD_TSI148) += cmd_tsi148.o
-obj-$(CONFIG_CMD_UBI) += cmd_ubi.o
-obj-$(CONFIG_CMD_UBIFS) += cmd_ubifs.o
-obj-$(CONFIG_CMD_UNIVERSE) += cmd_universe.o
-obj-$(CONFIG_CMD_UNZIP) += cmd_unzip.o
+obj-y += pcmcia.o
+obj-$(CONFIG_CMD_PORTIO) += portio.o
+obj-$(CONFIG_CMD_PXE) += pxe.o
+obj-$(CONFIG_CMD_READ) += read.o
+obj-$(CONFIG_CMD_REGINFO) += reginfo.o
+obj-$(CONFIG_CMD_REISER) += reiser.o
+obj-$(CONFIG_CMD_REMOTEPROC) += remoteproc.o
+obj-$(CONFIG_SANDBOX) += host.o
+obj-$(CONFIG_CMD_SATA) += sata.o
+obj-$(CONFIG_CMD_SF) += sf.o
+obj-$(CONFIG_CMD_SCSI) += scsi.o
+obj-$(CONFIG_CMD_SHA1SUM) += sha1sum.o
+obj-$(CONFIG_CMD_SETEXPR) += setexpr.o
+obj-$(CONFIG_CMD_SOFTSWITCH) += softswitch.o
+obj-$(CONFIG_CMD_SPI) += spi.o
+obj-$(CONFIG_CMD_SPIBOOTLDR) += spibootldr.o
+obj-$(CONFIG_CMD_STRINGS) += strings.o
+obj-$(CONFIG_CMD_TERMINAL) += terminal.o
+obj-$(CONFIG_CMD_TIME) += time.o
+obj-$(CONFIG_CMD_TRACE) += trace.o
+obj-$(CONFIG_SYS_HUSH_PARSER) += test.o
+obj-$(CONFIG_CMD_TPM) += tpm.o
+obj-$(CONFIG_CMD_TPM_TEST) += tpm_test.o
+obj-$(CONFIG_CMD_TSI148) += tsi148.o
+obj-$(CONFIG_CMD_UBI) += ubi.o
+obj-$(CONFIG_CMD_UBIFS) += ubifs.o
+obj-$(CONFIG_CMD_UNIVERSE) += universe.o
+obj-$(CONFIG_CMD_UNZIP) += unzip.o
 ifdef CONFIG_LZMA
-obj-$(CONFIG_CMD_LZMADEC) += cmd_lzmadec.o
+obj-$(CONFIG_CMD_LZMADEC) += lzmadec.o
 endif
 
-obj-$(CONFIG_CMD_USB) += cmd_usb.o
-obj-$(CONFIG_CMD_FASTBOOT) += cmd_fastboot.o
-obj-$(CONFIG_CMD_FS_UUID) += cmd_fs_uuid.o
+obj-$(CONFIG_CMD_USB) += usb.o
+obj-$(CONFIG_CMD_FASTBOOT) += fastboot.o
+obj-$(CONFIG_CMD_FS_UUID) += fs_uuid.o
 
-obj-$(CONFIG_CMD_USB_MASS_STORAGE) += cmd_usb_mass_storage.o
-obj-$(CONFIG_CMD_THOR_DOWNLOAD) += cmd_thordown.o
-obj-$(CONFIG_CMD_XIMG) += cmd_ximg.o
-obj-$(CONFIG_YAFFS2) += cmd_yaffs2.o
-obj-$(CONFIG_CMD_SPL) += cmd_spl.o
-obj-$(CONFIG_CMD_ZIP) += cmd_zip.o
-obj-$(CONFIG_CMD_ZFS) += cmd_zfs.o
+obj-$(CONFIG_CMD_USB_MASS_STORAGE) += usb_mass_storage.o
+obj-$(CONFIG_CMD_THOR_DOWNLOAD) += thordown.o
+obj-$(CONFIG_CMD_XIMG) += ximg.o
+obj-$(CONFIG_YAFFS2) += yaffs2.o
+obj-$(CONFIG_CMD_SPL) += spl.o
+obj-$(CONFIG_CMD_ZIP) += zip.o
+obj-$(CONFIG_CMD_ZFS) += zfs.o
 
-obj-$(CONFIG_CMD_DFU) += cmd_dfu.o
-obj-$(CONFIG_CMD_GPT) += cmd_gpt.o
-obj-$(CONFIG_CMD_ETHSW) += cmd_ethsw.o
+obj-$(CONFIG_CMD_DFU) += dfu.o
+obj-$(CONFIG_CMD_GPT) += gpt.o
+obj-$(CONFIG_CMD_ETHSW) += ethsw.o
 
 # Power
-obj-$(CONFIG_CMD_PMIC) += cmd_pmic.o
-obj-$(CONFIG_CMD_REGULATOR) += cmd_regulator.o
+obj-$(CONFIG_CMD_PMIC) += pmic.o
+obj-$(CONFIG_CMD_REGULATOR) += regulator.o
 endif # !CONFIG_SPL_BUILD
 
 ifdef CONFIG_SPL_BUILD
 ifdef CONFIG_SPL_SATA_SUPPORT
-obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o
+obj-$(CONFIG_CMD_SCSI) += scsi.o
 endif
 endif # CONFIG_SPL_BUILD
 
-obj-$(CONFIG_CMD_BLOB) += cmd_blob.o
+obj-$(CONFIG_CMD_BLOB) += blob.o
 
 # core command
-obj-y += cmd_nvedit.o
-obj-y += cmd_disk.o
+obj-y += nvedit.o
+obj-y += disk.o
diff --git a/cmd/cmd_aes.c b/cmd/aes.c
similarity index 100%
rename from cmd/cmd_aes.c
rename to cmd/aes.c
diff --git a/cmd/cmd_ambapp.c b/cmd/ambapp.c
similarity index 100%
rename from cmd/cmd_ambapp.c
rename to cmd/ambapp.c
diff --git a/cmd/cmd_armflash.c b/cmd/armflash.c
similarity index 100%
rename from cmd/cmd_armflash.c
rename to cmd/armflash.c
diff --git a/cmd/cmd_bdinfo.c b/cmd/bdinfo.c
similarity index 100%
rename from cmd/cmd_bdinfo.c
rename to cmd/bdinfo.c
diff --git a/cmd/cmd_bedbug.c b/cmd/bedbug.c
similarity index 100%
rename from cmd/cmd_bedbug.c
rename to cmd/bedbug.c
diff --git a/cmd/cmd_blob.c b/cmd/blob.c
similarity index 100%
rename from cmd/cmd_blob.c
rename to cmd/blob.c
diff --git a/cmd/cmd_bmp.c b/cmd/bmp.c
similarity index 100%
rename from cmd/cmd_bmp.c
rename to cmd/bmp.c
diff --git a/cmd/cmd_boot.c b/cmd/boot.c
similarity index 100%
rename from cmd/cmd_boot.c
rename to cmd/boot.c
diff --git a/cmd/cmd_bootldr.c b/cmd/bootldr.c
similarity index 100%
rename from cmd/cmd_bootldr.c
rename to cmd/bootldr.c
diff --git a/cmd/cmd_bootm.c b/cmd/bootm.c
similarity index 100%
rename from cmd/cmd_bootm.c
rename to cmd/bootm.c
diff --git a/cmd/cmd_bootmenu.c b/cmd/bootmenu.c
similarity index 100%
rename from cmd/cmd_bootmenu.c
rename to cmd/bootmenu.c
diff --git a/cmd/cmd_bootstage.c b/cmd/bootstage.c
similarity index 100%
rename from cmd/cmd_bootstage.c
rename to cmd/bootstage.c
diff --git a/cmd/cmd_cache.c b/cmd/cache.c
similarity index 100%
rename from cmd/cmd_cache.c
rename to cmd/cache.c
diff --git a/cmd/cmd_cbfs.c b/cmd/cbfs.c
similarity index 100%
rename from cmd/cmd_cbfs.c
rename to cmd/cbfs.c
diff --git a/cmd/cmd_clk.c b/cmd/clk.c
similarity index 100%
rename from cmd/cmd_clk.c
rename to cmd/clk.c
diff --git a/cmd/cmd_console.c b/cmd/console.c
similarity index 100%
rename from cmd/cmd_console.c
rename to cmd/console.c
diff --git a/cmd/cmd_cplbinfo.c b/cmd/cplbinfo.c
similarity index 100%
rename from cmd/cmd_cplbinfo.c
rename to cmd/cplbinfo.c
diff --git a/cmd/cmd_cpu.c b/cmd/cpu.c
similarity index 100%
rename from cmd/cmd_cpu.c
rename to cmd/cpu.c
diff --git a/cmd/cmd_cramfs.c b/cmd/cramfs.c
similarity index 100%
rename from cmd/cmd_cramfs.c
rename to cmd/cramfs.c
diff --git a/cmd/cmd_dataflash_mmc_mux.c b/cmd/dataflash_mmc_mux.c
similarity index 100%
rename from cmd/cmd_dataflash_mmc_mux.c
rename to cmd/dataflash_mmc_mux.c
diff --git a/cmd/cmd_date.c b/cmd/date.c
similarity index 100%
rename from cmd/cmd_date.c
rename to cmd/date.c
diff --git a/cmd/cmd_dcr.c b/cmd/dcr.c
similarity index 100%
rename from cmd/cmd_dcr.c
rename to cmd/dcr.c
diff --git a/cmd/cmd_demo.c b/cmd/demo.c
similarity index 100%
rename from cmd/cmd_demo.c
rename to cmd/demo.c
diff --git a/cmd/cmd_dfu.c b/cmd/dfu.c
similarity index 100%
rename from cmd/cmd_dfu.c
rename to cmd/dfu.c
diff --git a/cmd/cmd_diag.c b/cmd/diag.c
similarity index 100%
rename from cmd/cmd_diag.c
rename to cmd/diag.c
diff --git a/cmd/cmd_disk.c b/cmd/disk.c
similarity index 100%
rename from cmd/cmd_disk.c
rename to cmd/disk.c
diff --git a/cmd/cmd_display.c b/cmd/display.c
similarity index 100%
rename from cmd/cmd_display.c
rename to cmd/display.c
diff --git a/cmd/cmd_dtt.c b/cmd/dtt.c
similarity index 100%
rename from cmd/cmd_dtt.c
rename to cmd/dtt.c
diff --git a/cmd/cmd_echo.c b/cmd/echo.c
similarity index 100%
rename from cmd/cmd_echo.c
rename to cmd/echo.c
diff --git a/cmd/cmd_eeprom.c b/cmd/eeprom.c
similarity index 100%
rename from cmd/cmd_eeprom.c
rename to cmd/eeprom.c
diff --git a/cmd/cmd_efi.c b/cmd/efi.c
similarity index 100%
rename from cmd/cmd_efi.c
rename to cmd/efi.c
diff --git a/cmd/cmd_elf.c b/cmd/elf.c
similarity index 100%
rename from cmd/cmd_elf.c
rename to cmd/elf.c
diff --git a/cmd/cmd_ethsw.c b/cmd/ethsw.c
similarity index 100%
rename from cmd/cmd_ethsw.c
rename to cmd/ethsw.c
diff --git a/cmd/cmd_exit.c b/cmd/exit.c
similarity index 100%
rename from cmd/cmd_exit.c
rename to cmd/exit.c
diff --git a/cmd/cmd_ext2.c b/cmd/ext2.c
similarity index 100%
rename from cmd/cmd_ext2.c
rename to cmd/ext2.c
diff --git a/cmd/cmd_ext4.c b/cmd/ext4.c
similarity index 100%
rename from cmd/cmd_ext4.c
rename to cmd/ext4.c
diff --git a/cmd/cmd_fastboot.c b/cmd/fastboot.c
similarity index 100%
rename from cmd/cmd_fastboot.c
rename to cmd/fastboot.c
diff --git a/cmd/cmd_fat.c b/cmd/fat.c
similarity index 100%
rename from cmd/cmd_fat.c
rename to cmd/fat.c
diff --git a/cmd/cmd_fdc.c b/cmd/fdc.c
similarity index 100%
rename from cmd/cmd_fdc.c
rename to cmd/fdc.c
diff --git a/cmd/cmd_fdt.c b/cmd/fdt.c
similarity index 100%
rename from cmd/cmd_fdt.c
rename to cmd/fdt.c
diff --git a/cmd/cmd_fitupd.c b/cmd/fitupd.c
similarity index 100%
rename from cmd/cmd_fitupd.c
rename to cmd/fitupd.c
diff --git a/cmd/cmd_flash.c b/cmd/flash.c
similarity index 100%
rename from cmd/cmd_flash.c
rename to cmd/flash.c
diff --git a/cmd/cmd_fpga.c b/cmd/fpga.c
similarity index 100%
rename from cmd/cmd_fpga.c
rename to cmd/fpga.c
diff --git a/cmd/cmd_fpgad.c b/cmd/fpgad.c
similarity index 100%
rename from cmd/cmd_fpgad.c
rename to cmd/fpgad.c
diff --git a/cmd/cmd_fs.c b/cmd/fs.c
similarity index 100%
rename from cmd/cmd_fs.c
rename to cmd/fs.c
diff --git a/cmd/cmd_fs_uuid.c b/cmd/fs_uuid.c
similarity index 100%
rename from cmd/cmd_fs_uuid.c
rename to cmd/fs_uuid.c
diff --git a/cmd/cmd_fuse.c b/cmd/fuse.c
similarity index 100%
rename from cmd/cmd_fuse.c
rename to cmd/fuse.c
diff --git a/cmd/cmd_gettime.c b/cmd/gettime.c
similarity index 100%
rename from cmd/cmd_gettime.c
rename to cmd/gettime.c
diff --git a/cmd/cmd_gpio.c b/cmd/gpio.c
similarity index 100%
rename from cmd/cmd_gpio.c
rename to cmd/gpio.c
diff --git a/cmd/cmd_gpt.c b/cmd/gpt.c
similarity index 100%
rename from cmd/cmd_gpt.c
rename to cmd/gpt.c
diff --git a/cmd/cmd_hash.c b/cmd/hash.c
similarity index 100%
rename from cmd/cmd_hash.c
rename to cmd/hash.c
diff --git a/cmd/cmd_help.c b/cmd/help.c
similarity index 100%
rename from cmd/cmd_help.c
rename to cmd/help.c
diff --git a/cmd/cmd_host.c b/cmd/host.c
similarity index 100%
rename from cmd/cmd_host.c
rename to cmd/host.c
diff --git a/cmd/cmd_i2c.c b/cmd/i2c.c
similarity index 100%
rename from cmd/cmd_i2c.c
rename to cmd/i2c.c
diff --git a/cmd/cmd_ide.c b/cmd/ide.c
similarity index 100%
rename from cmd/cmd_ide.c
rename to cmd/ide.c
diff --git a/cmd/cmd_immap.c b/cmd/immap.c
similarity index 100%
rename from cmd/cmd_immap.c
rename to cmd/immap.c
diff --git a/cmd/cmd_ini.c b/cmd/ini.c
similarity index 100%
rename from cmd/cmd_ini.c
rename to cmd/ini.c
diff --git a/cmd/cmd_io.c b/cmd/io.c
similarity index 100%
rename from cmd/cmd_io.c
rename to cmd/io.c
diff --git a/cmd/cmd_iotrace.c b/cmd/iotrace.c
similarity index 100%
rename from cmd/cmd_iotrace.c
rename to cmd/iotrace.c
diff --git a/cmd/cmd_irq.c b/cmd/irq.c
similarity index 100%
rename from cmd/cmd_irq.c
rename to cmd/irq.c
diff --git a/cmd/cmd_itest.c b/cmd/itest.c
similarity index 100%
rename from cmd/cmd_itest.c
rename to cmd/itest.c
diff --git a/cmd/cmd_jffs2.c b/cmd/jffs2.c
similarity index 100%
rename from cmd/cmd_jffs2.c
rename to cmd/jffs2.c
diff --git a/cmd/cmd_ldrinfo.c b/cmd/ldrinfo.c
similarity index 100%
rename from cmd/cmd_ldrinfo.c
rename to cmd/ldrinfo.c
diff --git a/cmd/cmd_led.c b/cmd/led.c
similarity index 100%
rename from cmd/cmd_led.c
rename to cmd/led.c
diff --git a/cmd/cmd_license.c b/cmd/license.c
similarity index 100%
rename from cmd/cmd_license.c
rename to cmd/license.c
diff --git a/cmd/cmd_load.c b/cmd/load.c
similarity index 100%
rename from cmd/cmd_load.c
rename to cmd/load.c
diff --git a/cmd/cmd_log.c b/cmd/log.c
similarity index 100%
rename from cmd/cmd_log.c
rename to cmd/log.c
diff --git a/cmd/cmd_lzmadec.c b/cmd/lzmadec.c
similarity index 100%
rename from cmd/cmd_lzmadec.c
rename to cmd/lzmadec.c
diff --git a/cmd/cmd_mac.c b/cmd/mac.c
similarity index 100%
rename from cmd/cmd_mac.c
rename to cmd/mac.c
diff --git a/cmd/cmd_md5sum.c b/cmd/md5sum.c
similarity index 100%
rename from cmd/cmd_md5sum.c
rename to cmd/md5sum.c
diff --git a/cmd/cmd_mdio.c b/cmd/mdio.c
similarity index 100%
rename from cmd/cmd_mdio.c
rename to cmd/mdio.c
diff --git a/cmd/cmd_mem.c b/cmd/mem.c
similarity index 100%
rename from cmd/cmd_mem.c
rename to cmd/mem.c
diff --git a/cmd/cmd_mfsl.c b/cmd/mfsl.c
similarity index 100%
rename from cmd/cmd_mfsl.c
rename to cmd/mfsl.c
diff --git a/cmd/cmd_mii.c b/cmd/mii.c
similarity index 100%
rename from cmd/cmd_mii.c
rename to cmd/mii.c
diff --git a/cmd/cmd_misc.c b/cmd/misc.c
similarity index 100%
rename from cmd/cmd_misc.c
rename to cmd/misc.c
diff --git a/cmd/cmd_mmc.c b/cmd/mmc.c
similarity index 100%
rename from cmd/cmd_mmc.c
rename to cmd/mmc.c
diff --git a/cmd/cmd_mmc_spi.c b/cmd/mmc_spi.c
similarity index 100%
rename from cmd/cmd_mmc_spi.c
rename to cmd/mmc_spi.c
diff --git a/cmd/cmd_mp.c b/cmd/mp.c
similarity index 100%
rename from cmd/cmd_mp.c
rename to cmd/mp.c
diff --git a/cmd/cmd_mtdparts.c b/cmd/mtdparts.c
similarity index 100%
rename from cmd/cmd_mtdparts.c
rename to cmd/mtdparts.c
diff --git a/cmd/cmd_nand.c b/cmd/nand.c
similarity index 100%
rename from cmd/cmd_nand.c
rename to cmd/nand.c
diff --git a/cmd/cmd_net.c b/cmd/net.c
similarity index 100%
rename from cmd/cmd_net.c
rename to cmd/net.c
diff --git a/cmd/cmd_nvedit.c b/cmd/nvedit.c
similarity index 100%
rename from cmd/cmd_nvedit.c
rename to cmd/nvedit.c
diff --git a/cmd/cmd_onenand.c b/cmd/onenand.c
similarity index 100%
rename from cmd/cmd_onenand.c
rename to cmd/onenand.c
diff --git a/cmd/cmd_otp.c b/cmd/otp.c
similarity index 100%
rename from cmd/cmd_otp.c
rename to cmd/otp.c
diff --git a/cmd/cmd_part.c b/cmd/part.c
similarity index 100%
rename from cmd/cmd_part.c
rename to cmd/part.c
diff --git a/cmd/cmd_pci.c b/cmd/pci.c
similarity index 100%
rename from cmd/cmd_pci.c
rename to cmd/pci.c
diff --git a/cmd/cmd_pcmcia.c b/cmd/pcmcia.c
similarity index 100%
rename from cmd/cmd_pcmcia.c
rename to cmd/pcmcia.c
diff --git a/cmd/cmd_pmic.c b/cmd/pmic.c
similarity index 100%
rename from cmd/cmd_pmic.c
rename to cmd/pmic.c
diff --git a/cmd/cmd_portio.c b/cmd/portio.c
similarity index 100%
rename from cmd/cmd_portio.c
rename to cmd/portio.c
diff --git a/cmd/cmd_pxe.c b/cmd/pxe.c
similarity index 100%
rename from cmd/cmd_pxe.c
rename to cmd/pxe.c
diff --git a/cmd/cmd_read.c b/cmd/read.c
similarity index 100%
rename from cmd/cmd_read.c
rename to cmd/read.c
diff --git a/cmd/cmd_reginfo.c b/cmd/reginfo.c
similarity index 100%
rename from cmd/cmd_reginfo.c
rename to cmd/reginfo.c
diff --git a/cmd/cmd_regulator.c b/cmd/regulator.c
similarity index 100%
rename from cmd/cmd_regulator.c
rename to cmd/regulator.c
diff --git a/cmd/cmd_reiser.c b/cmd/reiser.c
similarity index 100%
rename from cmd/cmd_reiser.c
rename to cmd/reiser.c
diff --git a/cmd/cmd_remoteproc.c b/cmd/remoteproc.c
similarity index 100%
rename from cmd/cmd_remoteproc.c
rename to cmd/remoteproc.c
diff --git a/cmd/cmd_sata.c b/cmd/sata.c
similarity index 100%
rename from cmd/cmd_sata.c
rename to cmd/sata.c
diff --git a/cmd/cmd_scsi.c b/cmd/scsi.c
similarity index 100%
rename from cmd/cmd_scsi.c
rename to cmd/scsi.c
diff --git a/cmd/cmd_setexpr.c b/cmd/setexpr.c
similarity index 100%
rename from cmd/cmd_setexpr.c
rename to cmd/setexpr.c
diff --git a/cmd/cmd_sf.c b/cmd/sf.c
similarity index 100%
rename from cmd/cmd_sf.c
rename to cmd/sf.c
diff --git a/cmd/cmd_sha1sum.c b/cmd/sha1sum.c
similarity index 100%
rename from cmd/cmd_sha1sum.c
rename to cmd/sha1sum.c
diff --git a/cmd/cmd_softswitch.c b/cmd/softswitch.c
similarity index 100%
rename from cmd/cmd_softswitch.c
rename to cmd/softswitch.c
diff --git a/cmd/cmd_sound.c b/cmd/sound.c
similarity index 100%
rename from cmd/cmd_sound.c
rename to cmd/sound.c
diff --git a/cmd/cmd_source.c b/cmd/source.c
similarity index 100%
rename from cmd/cmd_source.c
rename to cmd/source.c
diff --git a/cmd/cmd_spi.c b/cmd/spi.c
similarity index 100%
rename from cmd/cmd_spi.c
rename to cmd/spi.c
diff --git a/cmd/cmd_spibootldr.c b/cmd/spibootldr.c
similarity index 100%
rename from cmd/cmd_spibootldr.c
rename to cmd/spibootldr.c
diff --git a/cmd/cmd_spl.c b/cmd/spl.c
similarity index 100%
rename from cmd/cmd_spl.c
rename to cmd/spl.c
diff --git a/cmd/cmd_strings.c b/cmd/strings.c
similarity index 100%
rename from cmd/cmd_strings.c
rename to cmd/strings.c
diff --git a/cmd/cmd_terminal.c b/cmd/terminal.c
similarity index 100%
rename from cmd/cmd_terminal.c
rename to cmd/terminal.c
diff --git a/cmd/cmd_test.c b/cmd/test.c
similarity index 100%
rename from cmd/cmd_test.c
rename to cmd/test.c
diff --git a/cmd/cmd_thordown.c b/cmd/thordown.c
similarity index 100%
rename from cmd/cmd_thordown.c
rename to cmd/thordown.c
diff --git a/cmd/cmd_time.c b/cmd/time.c
similarity index 100%
rename from cmd/cmd_time.c
rename to cmd/time.c
diff --git a/cmd/cmd_tpm.c b/cmd/tpm.c
similarity index 100%
rename from cmd/cmd_tpm.c
rename to cmd/tpm.c
diff --git a/cmd/cmd_tpm_test.c b/cmd/tpm_test.c
similarity index 100%
rename from cmd/cmd_tpm_test.c
rename to cmd/tpm_test.c
diff --git a/cmd/cmd_trace.c b/cmd/trace.c
similarity index 100%
rename from cmd/cmd_trace.c
rename to cmd/trace.c
diff --git a/cmd/cmd_tsi148.c b/cmd/tsi148.c
similarity index 100%
rename from cmd/cmd_tsi148.c
rename to cmd/tsi148.c
diff --git a/cmd/cmd_ubi.c b/cmd/ubi.c
similarity index 100%
rename from cmd/cmd_ubi.c
rename to cmd/ubi.c
diff --git a/cmd/cmd_ubifs.c b/cmd/ubifs.c
similarity index 100%
rename from cmd/cmd_ubifs.c
rename to cmd/ubifs.c
diff --git a/cmd/cmd_universe.c b/cmd/universe.c
similarity index 100%
rename from cmd/cmd_universe.c
rename to cmd/universe.c
diff --git a/cmd/cmd_unzip.c b/cmd/unzip.c
similarity index 100%
rename from cmd/cmd_unzip.c
rename to cmd/unzip.c
diff --git a/cmd/cmd_usb.c b/cmd/usb.c
similarity index 100%
rename from cmd/cmd_usb.c
rename to cmd/usb.c
diff --git a/cmd/cmd_usb_mass_storage.c b/cmd/usb_mass_storage.c
similarity index 100%
rename from cmd/cmd_usb_mass_storage.c
rename to cmd/usb_mass_storage.c
diff --git a/cmd/cmd_version.c b/cmd/version.c
similarity index 100%
rename from cmd/cmd_version.c
rename to cmd/version.c
diff --git a/cmd/cmd_ximg.c b/cmd/ximg.c
similarity index 100%
rename from cmd/cmd_ximg.c
rename to cmd/ximg.c
diff --git a/cmd/cmd_yaffs2.c b/cmd/yaffs2.c
similarity index 100%
rename from cmd/cmd_yaffs2.c
rename to cmd/yaffs2.c
diff --git a/cmd/cmd_zfs.c b/cmd/zfs.c
similarity index 100%
rename from cmd/cmd_zfs.c
rename to cmd/zfs.c
diff --git a/cmd/cmd_zip.c b/cmd/zip.c
similarity index 100%
rename from cmd/cmd_zip.c
rename to cmd/zip.c