diff --git a/urjtag/src/cmd/Makefile.am b/urjtag/src/cmd/Makefile.am
index bd19bc59..c626356b 100644
--- a/urjtag/src/cmd/Makefile.am
+++ b/urjtag/src/cmd/Makefile.am
@@ -25,53 +25,53 @@ include $(top_srcdir)/Makefile.rules
 
 noinst_LIBRARIES = libcmd.a
 
-libcmd_a_SOURCES = \
-	frequency.c \
-	cable.c \
-	reset.c \
-	discovery.c \
-	idcode.c \
-	detect.c \
-	detectflash.c \
-	help.c \
-	quit.c \
-	scan.c \
-	signal.c \
-	salias.c \
-	bit.c \
-	register.c \
-	initbus.c \
-	print.c \
-	part.c \
-	bus.c \
-	instruction.c \
-	shift.c \
-	dr.c \
-	get.c \
-	test.c \
-	debug.c \
-	shell.c \
-	set.c \
-	endian.c \
-	parse.c \
-	peekpoke.c \
-	pod.c \
-	readmem.c \
-	writemem.c \
-	flashmem.c \
-	eraseflash.c \
-	include.c \
-	addpart.c \
-	cmd.c \
-	usleep.c \
-	jtag_data_dir.c
+libcmd_a_SOURCES =
+libcmd_a_SOURCES += cmd_frequency.c
+libcmd_a_SOURCES += cmd_cable.c
+libcmd_a_SOURCES += cmd_reset.c
+libcmd_a_SOURCES += cmd_discovery.c
+libcmd_a_SOURCES += cmd_idcode.c
+libcmd_a_SOURCES += cmd_detect.c
+libcmd_a_SOURCES += cmd_detectflash.c
+libcmd_a_SOURCES += cmd_help.c
+libcmd_a_SOURCES += cmd_quit.c
+libcmd_a_SOURCES += cmd_scan.c
+libcmd_a_SOURCES += cmd_signal.c
+libcmd_a_SOURCES += cmd_salias.c
+libcmd_a_SOURCES += cmd_bit.c
+libcmd_a_SOURCES += cmd_register.c
+libcmd_a_SOURCES += cmd_initbus.c
+libcmd_a_SOURCES += cmd_print.c
+libcmd_a_SOURCES += cmd_part.c
+libcmd_a_SOURCES += cmd_bus.c
+libcmd_a_SOURCES += cmd_instruction.c
+libcmd_a_SOURCES += cmd_shift.c
+libcmd_a_SOURCES += cmd_dr.c
+libcmd_a_SOURCES += cmd_get.c
+libcmd_a_SOURCES += cmd_test.c
+libcmd_a_SOURCES += cmd_debug.c
+libcmd_a_SOURCES += cmd_shell.c
+libcmd_a_SOURCES += cmd_set.c
+libcmd_a_SOURCES += cmd_endian.c
+libcmd_a_SOURCES += cmd_parse.c
+libcmd_a_SOURCES += cmd_peekpoke.c
+libcmd_a_SOURCES += cmd_pod.c
+libcmd_a_SOURCES += cmd_readmem.c
+libcmd_a_SOURCES += cmd_writemem.c
+libcmd_a_SOURCES += cmd_flashmem.c
+libcmd_a_SOURCES += cmd_eraseflash.c
+libcmd_a_SOURCES += cmd_include.c
+libcmd_a_SOURCES += cmd_addpart.c
+libcmd_a_SOURCES += cmd_cmd.c
+libcmd_a_SOURCES += cmd_usleep.c
+libcmd_a_SOURCES += cmd_jtag_data_dir.c
 
 if ENABLE_SVF
-libcmd_a_SOURCES += svf.c
+libcmd_a_SOURCES += cmd_svf.c
 endif
 
 if ENABLE_BSDL
-libcmd_a_SOURCES += bsdl.c
+libcmd_a_SOURCES += cmd_bsdl.c
 endif
 
 AM_CPPFLAGS = -DJTAG_BIN_DIR=\"$(bindir)\" -DJTAG_DATA_DIR=\"$(pkgdatadir)\"
diff --git a/urjtag/src/cmd/addpart.c b/urjtag/src/cmd/cmd_addpart.c
similarity index 100%
rename from urjtag/src/cmd/addpart.c
rename to urjtag/src/cmd/cmd_addpart.c
diff --git a/urjtag/src/cmd/bit.c b/urjtag/src/cmd/cmd_bit.c
similarity index 100%
rename from urjtag/src/cmd/bit.c
rename to urjtag/src/cmd/cmd_bit.c
diff --git a/urjtag/src/cmd/bsdl.c b/urjtag/src/cmd/cmd_bsdl.c
similarity index 100%
rename from urjtag/src/cmd/bsdl.c
rename to urjtag/src/cmd/cmd_bsdl.c
diff --git a/urjtag/src/cmd/bus.c b/urjtag/src/cmd/cmd_bus.c
similarity index 100%
rename from urjtag/src/cmd/bus.c
rename to urjtag/src/cmd/cmd_bus.c
diff --git a/urjtag/src/cmd/cable.c b/urjtag/src/cmd/cmd_cable.c
similarity index 100%
rename from urjtag/src/cmd/cable.c
rename to urjtag/src/cmd/cmd_cable.c
diff --git a/urjtag/src/cmd/cmd.c b/urjtag/src/cmd/cmd_cmd.c
similarity index 100%
rename from urjtag/src/cmd/cmd.c
rename to urjtag/src/cmd/cmd_cmd.c
diff --git a/urjtag/src/cmd/debug.c b/urjtag/src/cmd/cmd_debug.c
similarity index 100%
rename from urjtag/src/cmd/debug.c
rename to urjtag/src/cmd/cmd_debug.c
diff --git a/urjtag/src/cmd/detect.c b/urjtag/src/cmd/cmd_detect.c
similarity index 100%
rename from urjtag/src/cmd/detect.c
rename to urjtag/src/cmd/cmd_detect.c
diff --git a/urjtag/src/cmd/detectflash.c b/urjtag/src/cmd/cmd_detectflash.c
similarity index 100%
rename from urjtag/src/cmd/detectflash.c
rename to urjtag/src/cmd/cmd_detectflash.c
diff --git a/urjtag/src/cmd/discovery.c b/urjtag/src/cmd/cmd_discovery.c
similarity index 100%
rename from urjtag/src/cmd/discovery.c
rename to urjtag/src/cmd/cmd_discovery.c
diff --git a/urjtag/src/cmd/dr.c b/urjtag/src/cmd/cmd_dr.c
similarity index 100%
rename from urjtag/src/cmd/dr.c
rename to urjtag/src/cmd/cmd_dr.c
diff --git a/urjtag/src/cmd/endian.c b/urjtag/src/cmd/cmd_endian.c
similarity index 100%
rename from urjtag/src/cmd/endian.c
rename to urjtag/src/cmd/cmd_endian.c
diff --git a/urjtag/src/cmd/eraseflash.c b/urjtag/src/cmd/cmd_eraseflash.c
similarity index 100%
rename from urjtag/src/cmd/eraseflash.c
rename to urjtag/src/cmd/cmd_eraseflash.c
diff --git a/urjtag/src/cmd/flashmem.c b/urjtag/src/cmd/cmd_flashmem.c
similarity index 100%
rename from urjtag/src/cmd/flashmem.c
rename to urjtag/src/cmd/cmd_flashmem.c
diff --git a/urjtag/src/cmd/frequency.c b/urjtag/src/cmd/cmd_frequency.c
similarity index 100%
rename from urjtag/src/cmd/frequency.c
rename to urjtag/src/cmd/cmd_frequency.c
diff --git a/urjtag/src/cmd/get.c b/urjtag/src/cmd/cmd_get.c
similarity index 100%
rename from urjtag/src/cmd/get.c
rename to urjtag/src/cmd/cmd_get.c
diff --git a/urjtag/src/cmd/help.c b/urjtag/src/cmd/cmd_help.c
similarity index 100%
rename from urjtag/src/cmd/help.c
rename to urjtag/src/cmd/cmd_help.c
diff --git a/urjtag/src/cmd/idcode.c b/urjtag/src/cmd/cmd_idcode.c
similarity index 100%
rename from urjtag/src/cmd/idcode.c
rename to urjtag/src/cmd/cmd_idcode.c
diff --git a/urjtag/src/cmd/include.c b/urjtag/src/cmd/cmd_include.c
similarity index 100%
rename from urjtag/src/cmd/include.c
rename to urjtag/src/cmd/cmd_include.c
diff --git a/urjtag/src/cmd/initbus.c b/urjtag/src/cmd/cmd_initbus.c
similarity index 100%
rename from urjtag/src/cmd/initbus.c
rename to urjtag/src/cmd/cmd_initbus.c
diff --git a/urjtag/src/cmd/instruction.c b/urjtag/src/cmd/cmd_instruction.c
similarity index 100%
rename from urjtag/src/cmd/instruction.c
rename to urjtag/src/cmd/cmd_instruction.c
diff --git a/urjtag/src/cmd/jtag_data_dir.c b/urjtag/src/cmd/cmd_jtag_data_dir.c
similarity index 100%
rename from urjtag/src/cmd/jtag_data_dir.c
rename to urjtag/src/cmd/cmd_jtag_data_dir.c
diff --git a/urjtag/src/cmd/parse.c b/urjtag/src/cmd/cmd_parse.c
similarity index 100%
rename from urjtag/src/cmd/parse.c
rename to urjtag/src/cmd/cmd_parse.c
diff --git a/urjtag/src/cmd/part.c b/urjtag/src/cmd/cmd_part.c
similarity index 100%
rename from urjtag/src/cmd/part.c
rename to urjtag/src/cmd/cmd_part.c
diff --git a/urjtag/src/cmd/peekpoke.c b/urjtag/src/cmd/cmd_peekpoke.c
similarity index 100%
rename from urjtag/src/cmd/peekpoke.c
rename to urjtag/src/cmd/cmd_peekpoke.c
diff --git a/urjtag/src/cmd/pod.c b/urjtag/src/cmd/cmd_pod.c
similarity index 100%
rename from urjtag/src/cmd/pod.c
rename to urjtag/src/cmd/cmd_pod.c
diff --git a/urjtag/src/cmd/print.c b/urjtag/src/cmd/cmd_print.c
similarity index 100%
rename from urjtag/src/cmd/print.c
rename to urjtag/src/cmd/cmd_print.c
diff --git a/urjtag/src/cmd/quit.c b/urjtag/src/cmd/cmd_quit.c
similarity index 100%
rename from urjtag/src/cmd/quit.c
rename to urjtag/src/cmd/cmd_quit.c
diff --git a/urjtag/src/cmd/readmem.c b/urjtag/src/cmd/cmd_readmem.c
similarity index 100%
rename from urjtag/src/cmd/readmem.c
rename to urjtag/src/cmd/cmd_readmem.c
diff --git a/urjtag/src/cmd/register.c b/urjtag/src/cmd/cmd_register.c
similarity index 100%
rename from urjtag/src/cmd/register.c
rename to urjtag/src/cmd/cmd_register.c
diff --git a/urjtag/src/cmd/reset.c b/urjtag/src/cmd/cmd_reset.c
similarity index 100%
rename from urjtag/src/cmd/reset.c
rename to urjtag/src/cmd/cmd_reset.c
diff --git a/urjtag/src/cmd/salias.c b/urjtag/src/cmd/cmd_salias.c
similarity index 100%
rename from urjtag/src/cmd/salias.c
rename to urjtag/src/cmd/cmd_salias.c
diff --git a/urjtag/src/cmd/scan.c b/urjtag/src/cmd/cmd_scan.c
similarity index 100%
rename from urjtag/src/cmd/scan.c
rename to urjtag/src/cmd/cmd_scan.c
diff --git a/urjtag/src/cmd/set.c b/urjtag/src/cmd/cmd_set.c
similarity index 100%
rename from urjtag/src/cmd/set.c
rename to urjtag/src/cmd/cmd_set.c
diff --git a/urjtag/src/cmd/shell.c b/urjtag/src/cmd/cmd_shell.c
similarity index 100%
rename from urjtag/src/cmd/shell.c
rename to urjtag/src/cmd/cmd_shell.c
diff --git a/urjtag/src/cmd/shift.c b/urjtag/src/cmd/cmd_shift.c
similarity index 100%
rename from urjtag/src/cmd/shift.c
rename to urjtag/src/cmd/cmd_shift.c
diff --git a/urjtag/src/cmd/signal.c b/urjtag/src/cmd/cmd_signal.c
similarity index 100%
rename from urjtag/src/cmd/signal.c
rename to urjtag/src/cmd/cmd_signal.c
diff --git a/urjtag/src/cmd/svf.c b/urjtag/src/cmd/cmd_svf.c
similarity index 100%
rename from urjtag/src/cmd/svf.c
rename to urjtag/src/cmd/cmd_svf.c
diff --git a/urjtag/src/cmd/test.c b/urjtag/src/cmd/cmd_test.c
similarity index 100%
rename from urjtag/src/cmd/test.c
rename to urjtag/src/cmd/cmd_test.c
diff --git a/urjtag/src/cmd/usleep.c b/urjtag/src/cmd/cmd_usleep.c
similarity index 100%
rename from urjtag/src/cmd/usleep.c
rename to urjtag/src/cmd/cmd_usleep.c
diff --git a/urjtag/src/cmd/writemem.c b/urjtag/src/cmd/cmd_writemem.c
similarity index 100%
rename from urjtag/src/cmd/writemem.c
rename to urjtag/src/cmd/cmd_writemem.c