diff --git a/libfreefare/Makefile.am b/libfreefare/Makefile.am
index ba789fb..5e07e5b 100644
--- a/libfreefare/Makefile.am
+++ b/libfreefare/Makefile.am
@@ -11,9 +11,9 @@ libfreefare_la_SOURCES = freefare.c \
 			 mifare_desfire.c \
 			 mifare_desfire_aid.c \
 			 mifare_desfire_authenticate.c \
+			 mifare_desfire_error.c \
 			 mifare_desfire_key.c \
 			 mad.c \
-			 desfire_error.c \
 			 mifare_application.c \
 			 tlv.c
 libfreefare_la_LIBADD =
diff --git a/libfreefare/freefare.h b/libfreefare/freefare.h
index c8ced90..e0b0bbb 100644
--- a/libfreefare/freefare.h
+++ b/libfreefare/freefare.h
@@ -347,7 +347,7 @@ uint8_t		 mifare_desfire_key_get_version (MifareDESFireKey key);
 void		 mifare_desfire_key_set_version (MifareDESFireKey key, uint8_t version);
 void		 mifare_desfire_key_free (MifareDESFireKey key);
 
-const char	*desfire_error_lookup (uint8_t error);
+const char	*mifare_desfire_error_lookup (uint8_t error);
 
 uint8_t		*tlv_encode (const uint8_t type, const uint8_t *istream, uint16_t isize, size_t *osize);
 uint8_t		*tlv_decode (const uint8_t *istream, uint8_t *type, uint16_t *size);
diff --git a/libfreefare/desfire_error.c b/libfreefare/mifare_desfire_error.c
similarity index 100%
rename from libfreefare/desfire_error.c
rename to libfreefare/mifare_desfire_error.c
diff --git a/test/test_mifare_desfire.c b/test/test_mifare_desfire.c
index d2a3eef..74e0c0f 100644
--- a/test/test_mifare_desfire.c
+++ b/test/test_mifare_desfire.c
@@ -34,7 +34,7 @@ uint8_t key_data_3des[16] = { 'C', 'a', 'r', 'd', ' ', 'M', 'a', 's', 't', 'e',
 #define cut_assert_success(last_command) \
     do { \
 	if ((res < 0) || (MIFARE_DESFIRE (tag)->last_picc_error != OPERATION_OK)) { \
-	    cut_fail ("%s returned %d, error: %s, errno: %s\n", last_command, res, desfire_error_lookup (MIFARE_DESFIRE (tag)->last_picc_error), strerror (errno)); \
+	    cut_fail ("%s returned %d, error: %s, errno: %s\n", last_command, res, mifare_desfire_error_lookup (MIFARE_DESFIRE (tag)->last_picc_error), strerror (errno)); \
 	} \
     } while (0)