diff --git a/examples/Makefile.am b/examples/Makefile.am
index fede8fb..b3bed24 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,5 +1,7 @@
 bin_PROGRAMS = \
 		nfc-anticol \
+		nfc-dep-initiator \
+		nfc-dep-target \
 		nfc-emulate-forum-tag4 \
 		nfc-emulate-tag \
 		nfc-emulate-uid \
@@ -8,8 +10,6 @@ bin_PROGRAMS = \
 		nfc-mfultralight \
 		nfc-poll \
 		nfc-relay \
-		nfcip-initiator \
-		nfcip-target \
 		pn53x-diagnose \
 		pn53x-sam \
 		pn53x-tamashell
@@ -58,12 +58,12 @@ nfc_emulate_uid_SOURCES = nfc-emulate-uid.c
 nfc_emulate_uid_LDADD = $(top_builddir)/libnfc/libnfc.la \
 		        libnfcutils.la
 
-nfcip_target_SOURCES = nfcip-target.c
-nfcip_target_LDADD = $(top_builddir)/libnfc/libnfc.la \
+nfc_dep_target_SOURCES = nfc-dep-target.c
+nfc_dep_target_LDADD = $(top_builddir)/libnfc/libnfc.la \
 		     libnfcutils.la
 
-nfcip_initiator_SOURCES = nfcip-initiator.c
-nfcip_initiator_LDADD = $(top_builddir)/libnfc/libnfc.la \
+nfc_dep_initiator_SOURCES = nfc-dep-initiator.c
+nfc_dep_initiator_LDADD = $(top_builddir)/libnfc/libnfc.la \
 			libnfcutils.la
 
 pn53x_diagnose_SOURCES = pn53x-diagnose.c
@@ -81,6 +81,8 @@ pn53x_tamashell_LDFLAGS = @READLINE_LIBS@
 
 dist_man_MANS = \
 		nfc-anticol.1 \
+		nfc-dep-initiator.1 \
+		nfc-dep-target.1 \
 		nfc-emulate-forum-tag4.1 \
 		nfc-emulate-tag.1 \
 		nfc-emulate-uid.1 \
diff --git a/examples/nfcip-initiator.1 b/examples/nfc-dep-initiator.1
similarity index 78%
rename from examples/nfcip-initiator.1
rename to examples/nfc-dep-initiator.1
index 6ac0590..579792c 100644
--- a/examples/nfcip-initiator.1
+++ b/examples/nfc-dep-initiator.1
@@ -1,15 +1,15 @@
-.TH NFCIP-INITIATOR 1 "October 8, 2010"
+.TH NFC-DEP-INITIATOR 1 "October 8, 2010"
 .SH NAME
-nfcip-initiator \- Demonstration tool to send/received data as D.E.P. initiator
+nfc-dep-initiator \- Demonstration tool to send/received data as D.E.P. initiator
 .SH SYNOPSIS
-.B nfcip-initiator
+.B nfc-dep-initiator
 .SH DESCRIPTION
-.B nfcip-initiator
+.B nfc-dep-initiator
 is a demonstration tool for putting NFC device in D.E.P. initiator mode.
 
 This example will attempt to select a passive D.E.P. target and exchange a simple "Hello" data with target.
 
-Note: this example is designed to work with a D.E.P. target driven by \fBnfcip-target\fP
+Note: this example is designed to work with a D.E.P. target driven by \fBnfc-dep-target\fP
 
 .SH BUGS
 Please report any bugs on the
diff --git a/examples/nfcip-initiator.c b/examples/nfc-dep-initiator.c
similarity index 97%
rename from examples/nfcip-initiator.c
rename to examples/nfc-dep-initiator.c
index d15a304..52f700c 100644
--- a/examples/nfcip-initiator.c
+++ b/examples/nfc-dep-initiator.c
@@ -2,6 +2,7 @@
  * Public platform independent Near Field Communication (NFC) library
  * 
  * Copyright (C) 2009, Roel Verdult
+ * Copyright (C) 2010, Romuald Conty
  * 
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published by the
@@ -18,7 +19,7 @@
  */
 
 /**
- * @file nfcip-initiator.c
+ * @file nfc-dep-initiator.c
  * @brief Turns the NFC device into a D.E.P. initiator (see NFCIP-1)
  */
 
diff --git a/examples/nfcip-target.1 b/examples/nfc-dep-target.1
similarity index 79%
rename from examples/nfcip-target.1
rename to examples/nfc-dep-target.1
index 650d8e6..3f002b3 100644
--- a/examples/nfcip-target.1
+++ b/examples/nfc-dep-target.1
@@ -1,15 +1,15 @@
-.TH NFCIP-INITIATOR 1 "October 8, 2010"
+.TH NFC-DEP-INITIATOR 1 "October 8, 2010"
 .SH NAME
-nfcip-target \- Demonstration tool to send/received data as D.E.P. target
+nfc-dep-target \- Demonstration tool to send/received data as D.E.P. target
 .SH SYNOPSIS
-.B nfcip-target
+.B nfc-dep-target
 .SH DESCRIPTION
-.B nfcip-target
+.B nfc-dep-target
 is a demonstration tool for putting NFC device in D.E.P. target mode.
 
 This example will listen for a D.E.P. initiator and exchange a simple "Hello" data with initiator.
 
-Note: this example is designed to work with a D.E.P. initiator driven by \fBnfcip-initiator\fP.
+Note: this example is designed to work with a D.E.P. initiator driven by \fBnfc-dep-initiator\fP.
 
 .SH BUGS
 Please report any bugs on the
diff --git a/examples/nfcip-target.c b/examples/nfc-dep-target.c
similarity index 94%
rename from examples/nfcip-target.c
rename to examples/nfc-dep-target.c
index a8d25f2..f3bbaa2 100644
--- a/examples/nfcip-target.c
+++ b/examples/nfc-dep-target.c
@@ -2,6 +2,7 @@
  * Public platform independent Near Field Communication (NFC) library
  * 
  * Copyright (C) 2009, Roel Verdult
+ * Copyright (C) 2009, Romuald Conty
  * 
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published by the
@@ -18,7 +19,7 @@
  */
 
 /**
- * @file nfcip-target.c
+ * @file nfc-dep-target.c
  * @brief Turns the NFC device into a D.E.P. target (see NFCIP-1)
  */
 
@@ -44,9 +45,9 @@ main (int argc, const char *argv[])
   #define MAX_DEVICE_COUNT 2
   nfc_device_desc_t pnddDevices[MAX_DEVICE_COUNT];
   nfc_list_devices (pnddDevices, MAX_DEVICE_COUNT, &szDeviceFound);
-  // Little hack to allow using nfcip-initiator & nfcip-target from
+  // Little hack to allow using nfc-dep-initiator & nfc-dep-target from
   // the same machine: if there is more than one readers connected
-  // nfcip-target will connect to the second reader
+  // nfc-dep-target will connect to the second reader
   // (we hope they're always detected in the same order)
   if (szDeviceFound == 1) {
     pnd = nfc_connect (&(pnddDevices[0]));