diff --git a/Makefile.am b/Makefile.am
index 37e22a1..2ed5052 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,8 +6,8 @@ AM_LDFLAGS = @LIBNFC_LIBS@
 
 lib_LTLIBRARIES = libfreefare.la
 
-libfreefare_la_SOURCES = mifare_classic.c mifare_application_directory.c
-libfreefare_la_HEADERS = mifare_classic.h mifare_application_directory.h
+libfreefare_la_SOURCES = mifare_classic.c mad.c
+libfreefare_la_HEADERS = mifare_classic.h mad.h
 libfreefare_ladir = $(includedir)
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/mifare_application_directory.c b/mad.c
similarity index 99%
rename from mifare_application_directory.c
rename to mad.c
index 6947c23..212425c 100644
--- a/mifare_application_directory.c
+++ b/mad.c
@@ -30,7 +30,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include "mifare_application_directory.h"
+#include "mad.h"
 
 struct aid {
     uint8_t function_cluster_code;
diff --git a/mifare_application_directory.h b/mad.h
similarity index 100%
rename from mifare_application_directory.h
rename to mad.h
diff --git a/test/Makefile b/test/Makefile
index 21cf625..54705a7 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -2,7 +2,7 @@ LMF_SRCDIR=	${.CURDIR}/..
 .PATH:		${LMF_SRCDIR}
 
 #LMF_SRCS!=	${MAKE} -f ${LMF_SRCDIR}/Makefile -V SRCS
-LMF_SRCS=	../mifare_classic.c ../mifare_application_directory.c
+LMF_SRCS=	../mifare_classic.c ../mad.c
 
 TESTS=		test_read_sector_0.c \
 		test_authenticate.c \
diff --git a/test/test.h b/test/test.h
index c6aeb59..e9ec5b0 100644
--- a/test/test.h
+++ b/test/test.h
@@ -205,7 +205,7 @@ int read_open_memory2(struct archive *, void *, size_t, size_t);
 
 #include <nfc/nfc.h>
 #include <mifare_classic.h>
-#include <mifare_application_directory.h>
+#include <mad.h>
 
 int	 mifare_classic_test_setup (MifareClassicTag *tag);
 int	 mifare_classic_test_teardown (MifareClassicTag tag);