diff --git a/autogen.sh b/autogen.sh
index 28a0b64d..b490f4ed 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -24,7 +24,7 @@ AUTOGEN_FILES="INSTALL \
 		coap_config.h coap_config.h.in* compile config.guess config.h* config.log config.status config.sub configure \
 		depcomp \
 		doc/Doxyfile doc/doxyfile.stamp doc/doxygen_sqlite3.db doc/Makefile doc/Makefile.in \
-		examples/*.o examples/rd.o examples/coap-* examples/rd \
+		examples/*.o  examples/coap-client examples/coap-server examples/coap-rd \
 		include/coap/coap.h
 		install-sh \
 		libcoap-1.pc libtool ltmain.sh \
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 297d8886..535f752b 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -12,15 +12,15 @@ if BUILD_EXAMPLES
 AM_CFLAGS = -isystem@top_builddir@/include/coap/ $(WARNING_CFLAGS) -std=c99
 
 # etsi_iot_01 and tiny are missing
-bin_PROGRAMS = coap-client coap-server rd
+bin_PROGRAMS = coap-client coap-server coap-rd
 
 coap_client_SOURCES = client.c coap_list.c
 coap_client_LDADD = @top_builddir@/.libs/libcoap-$(LIBCOAP_API_VERSION).la
 
-coap_server_SOURCES = server.c
+coap_server_SOURCES = coap-server.c
 coap_server_LDADD = @top_builddir@/.libs/libcoap-$(LIBCOAP_API_VERSION).la
 
-rd_SOURCES = rd.c
-rd_LDADD = @top_builddir@/.libs/libcoap-$(LIBCOAP_API_VERSION).la
+coap_rd_SOURCES = coap-rd.c
+coap_rd_LDADD = @top_builddir@/.libs/libcoap-$(LIBCOAP_API_VERSION).la
 
 endif # BUILD_EXAMPLES
diff --git a/examples/rd.c b/examples/coap-rd.c
similarity index 100%
rename from examples/rd.c
rename to examples/coap-rd.c
diff --git a/examples/server.c b/examples/coap-server.c
similarity index 100%
rename from examples/server.c
rename to examples/coap-server.c