diff --git a/input/Makefile.am b/input/Makefile.am
index 68fb129c..16740347 100644
--- a/input/Makefile.am
+++ b/input/Makefile.am
@@ -21,8 +21,8 @@
 noinst_LTLIBRARIES = libsigrokinput.la
 
 libsigrokinput_la_SOURCES = \
-	input_binary.c \
-	input_chronovu_la8.c \
+	binary.c \
+	chronovu_la8.c \
 	input.c
 
 libsigrokinput_la_CFLAGS = \
diff --git a/input/input_binary.c b/input/binary.c
similarity index 100%
rename from input/input_binary.c
rename to input/binary.c
diff --git a/input/input_chronovu_la8.c b/input/chronovu_la8.c
similarity index 100%
rename from input/input_chronovu_la8.c
rename to input/chronovu_la8.c
diff --git a/output/Makefile.am b/output/Makefile.am
index 77650966..87114005 100644
--- a/output/Makefile.am
+++ b/output/Makefile.am
@@ -23,12 +23,12 @@ SUBDIRS = text
 noinst_LTLIBRARIES = libsigrokoutput.la
 
 libsigrokoutput_la_SOURCES = \
-	output_binary.c \
-	output_vcd.c \
-	output_ols.c \
-	output_gnuplot.c \
-	output_chronovu_la8.c \
-	output_csv.c \
+	binary.c \
+	vcd.c \
+	ols.c \
+	gnuplot.c \
+	chronovu_la8.c \
+	csv.c \
 	output.c
 
 # Temporarily disabled: output_analog.c
diff --git a/output/output_analog.c b/output/analog.c
similarity index 100%
rename from output/output_analog.c
rename to output/analog.c
diff --git a/output/output_binary.c b/output/binary.c
similarity index 100%
rename from output/output_binary.c
rename to output/binary.c
diff --git a/output/output_chronovu_la8.c b/output/chronovu_la8.c
similarity index 100%
rename from output/output_chronovu_la8.c
rename to output/chronovu_la8.c
diff --git a/output/output_csv.c b/output/csv.c
similarity index 100%
rename from output/output_csv.c
rename to output/csv.c
diff --git a/output/output_gnuplot.c b/output/gnuplot.c
similarity index 100%
rename from output/output_gnuplot.c
rename to output/gnuplot.c
diff --git a/output/output_ols.c b/output/ols.c
similarity index 100%
rename from output/output_ols.c
rename to output/ols.c
diff --git a/output/output_vcd.c b/output/vcd.c
similarity index 100%
rename from output/output_vcd.c
rename to output/vcd.c