diff --git a/features/nfc/acore/acore/buffer.h b/features/nfc/acore/acore/ac_buffer.h
similarity index 100%
rename from features/nfc/acore/acore/buffer.h
rename to features/nfc/acore/acore/ac_buffer.h
diff --git a/features/nfc/acore/acore/buffer_builder.h b/features/nfc/acore/acore/ac_buffer_builder.h
similarity index 99%
rename from features/nfc/acore/acore/buffer_builder.h
rename to features/nfc/acore/acore/ac_buffer_builder.h
index c5b4ea28c4..2b96e8abc4 100644
--- a/features/nfc/acore/acore/buffer_builder.h
+++ b/features/nfc/acore/acore/ac_buffer_builder.h
@@ -37,7 +37,7 @@ extern "C" {
 #include "stddef.h"
 #include "stdbool.h"
 
-#include "acore/buffer.h"
+#include "acore/ac_buffer.h"
 
 typedef struct __ac_buffer_builder {
     ac_buffer_t ac_buffer;
diff --git a/features/nfc/acore/acore/buffer_reader.h b/features/nfc/acore/acore/ac_buffer_reader.h
similarity index 99%
rename from features/nfc/acore/acore/buffer_reader.h
rename to features/nfc/acore/acore/ac_buffer_reader.h
index 2f2398e7b6..598029ea06 100644
--- a/features/nfc/acore/acore/buffer_reader.h
+++ b/features/nfc/acore/acore/ac_buffer_reader.h
@@ -37,7 +37,7 @@ extern "C" {
 #include "stddef.h"
 #include "stdbool.h"
 
-#include "acore/buffer.h"
+#include "acore/ac_buffer.h"
 
 /** Read n-bytes in big-endian format from buffer reader and advance read posiion
  * \param pBuf the buffer to read from
diff --git a/features/nfc/acore/acore/debug.h b/features/nfc/acore/acore/ac_debug.h
similarity index 100%
rename from features/nfc/acore/acore/debug.h
rename to features/nfc/acore/acore/ac_debug.h
diff --git a/features/nfc/acore/acore/macros.h b/features/nfc/acore/acore/ac_macros.h
similarity index 100%
rename from features/nfc/acore/acore/macros.h
rename to features/nfc/acore/acore/ac_macros.h
diff --git a/features/nfc/acore/acore/stream.h b/features/nfc/acore/acore/ac_stream.h
similarity index 98%
rename from features/nfc/acore/acore/stream.h
rename to features/nfc/acore/acore/ac_stream.h
index 15bad3811e..38b704c753 100644
--- a/features/nfc/acore/acore/stream.h
+++ b/features/nfc/acore/acore/ac_stream.h
@@ -37,7 +37,7 @@ typedef struct __ac_ostream ac_ostream_t;
 #include "stdbool.h"
 #include "stdint.h"
 
-#include "acore/buffer.h"
+#include "acore/ac_buffer.h"
 
 typedef void (*ac_istream_fn)(ac_buffer_t *pDataIn, bool *pClose, size_t maxLength, void *pUserParam);
 typedef void (*ac_ostream_fn)(ac_buffer_t *pDataOut, bool closed, void *pUserParam);
diff --git a/features/nfc/acore/source/buffer.c b/features/nfc/acore/source/ac_buffer.c
similarity index 95%
rename from features/nfc/acore/source/buffer.c
rename to features/nfc/acore/source/ac_buffer.c
index c2af8a6575..c3b91fffd2 100644
--- a/features/nfc/acore/source/buffer.c
+++ b/features/nfc/acore/source/ac_buffer.c
@@ -23,11 +23,11 @@
 
 #include "string.h"
 
-#include "acore/buffer.h"
-#include "acore/buffer_reader.h"
-#include "acore/macros.h"
+#include "acore/ac_buffer.h"
+#include "acore/ac_buffer_reader.h"
+#include "acore/ac_macros.h"
 
-#include "acore/debug.h"
+#include "acore/ac_debug.h"
 
 void ac_buffer_init(ac_buffer_t *pBuf, const uint8_t *data, size_t size)
 {
diff --git a/features/nfc/acore/source/buffer_builder.c b/features/nfc/acore/source/ac_buffer_builder.c
similarity index 97%
rename from features/nfc/acore/source/buffer_builder.c
rename to features/nfc/acore/source/ac_buffer_builder.c
index c83fc9e8ed..54f4b5e0c0 100644
--- a/features/nfc/acore/source/buffer_builder.c
+++ b/features/nfc/acore/source/ac_buffer_builder.c
@@ -20,9 +20,9 @@
  * \author Donatien Garnier
  */
 
-#include "acore/buffer_builder.h"
-#include "acore/buffer_reader.h"
-#include "acore/macros.h"
+#include "acore/ac_buffer_builder.h"
+#include "acore/ac_buffer_reader.h"
+#include "acore/ac_macros.h"
 
 #include "string.h"
 
diff --git a/features/nfc/acore/source/buffer_reader.c b/features/nfc/acore/source/ac_buffer_reader.c
similarity index 98%
rename from features/nfc/acore/source/buffer_reader.c
rename to features/nfc/acore/source/ac_buffer_reader.c
index cee5dc7d06..44d0303978 100644
--- a/features/nfc/acore/source/buffer_reader.c
+++ b/features/nfc/acore/source/ac_buffer_reader.c
@@ -20,8 +20,8 @@
  * \author Donatien Garnier
  */
 
-#include "acore/buffer_reader.h"
-#include "acore/macros.h"
+#include "acore/ac_buffer_reader.h"
+#include "acore/ac_macros.h"
 
 #include "string.h"
 
diff --git a/features/nfc/acore/source/stream.c b/features/nfc/acore/source/ac_stream.c
similarity index 96%
rename from features/nfc/acore/source/stream.c
rename to features/nfc/acore/source/ac_stream.c
index c867ba96eb..6954f25be4 100644
--- a/features/nfc/acore/source/stream.c
+++ b/features/nfc/acore/source/ac_stream.c
@@ -20,8 +20,8 @@
  * \author Donatien Garnier
  */
 
-#include "acore/stream.h"
-#include "acore/macros.h"
+#include "acore/ac_stream.h"
+#include "acore/ac_macros.h"
 
 //Called by supplier
 void ac_istream_init(ac_istream_t *pac_istream, ac_istream_fn fn, void *pUserParam)
diff --git a/features/nfc/nfc/NFCDefinitions.h b/features/nfc/nfc/NFCDefinitions.h
index 2ac8a745cc..bf4c037f5e 100644
--- a/features/nfc/nfc/NFCDefinitions.h
+++ b/features/nfc/nfc/NFCDefinitions.h
@@ -20,7 +20,7 @@
 #include <stdint.h>
 #include "stack/nfc_errors.h"
 
-#include "acore/buffer.h"
+#include "acore/ac_buffer.h"
 
 namespace mbed {
 namespace nfc {
diff --git a/features/nfc/nfc/Type4RemoteInitiator.h b/features/nfc/nfc/Type4RemoteInitiator.h
index 526f85dcbb..dfc7eb2c29 100644
--- a/features/nfc/nfc/Type4RemoteInitiator.h
+++ b/features/nfc/nfc/Type4RemoteInitiator.h
@@ -24,7 +24,7 @@
 #include "NFCNDEFCapable.h"
 #include "NFCRemoteInitiator.h"
 
-#include "acore/buffer.h"
+#include "acore/ac_buffer.h"
 
 namespace mbed {
 namespace nfc {
diff --git a/features/nfc/source/nfc/NFCNDEFCapable.cpp b/features/nfc/source/nfc/NFCNDEFCapable.cpp
index d70df62b79..9c6c4e5515 100644
--- a/features/nfc/source/nfc/NFCNDEFCapable.cpp
+++ b/features/nfc/source/nfc/NFCNDEFCapable.cpp
@@ -16,9 +16,9 @@
 
 #include "NFCNDEFCapable.h"
 
-#include "acore/buffer.h"
-#include "acore/buffer_reader.h"
-#include "acore/buffer_builder.h"
+#include "acore/ac_buffer.h"
+#include "acore/ac_buffer_reader.h"
+#include "acore/ac_buffer_builder.h"
 
 #include "ndef/ndef.h"
 
diff --git a/features/nfc/source/nfc/NFCRemoteEndpoint.cpp b/features/nfc/source/nfc/NFCRemoteEndpoint.cpp
index 21349b2aae..3a62f0f124 100644
--- a/features/nfc/source/nfc/NFCRemoteEndpoint.cpp
+++ b/features/nfc/source/nfc/NFCRemoteEndpoint.cpp
@@ -16,9 +16,9 @@
 
 #include "NFCRemoteEndpoint.h"
 
-#include "acore/buffer.h"
-#include "acore/buffer_reader.h"
-#include "acore/buffer_builder.h"
+#include "acore/ac_buffer.h"
+#include "acore/ac_buffer_reader.h"
+#include "acore/ac_buffer_builder.h"
 
 #include "stack/transceiver/transceiver.h"
 
diff --git a/features/nfc/source/nfc/Type4RemoteInitiator.cpp b/features/nfc/source/nfc/Type4RemoteInitiator.cpp
index a7e3aaf8a0..7475cc9175 100644
--- a/features/nfc/source/nfc/Type4RemoteInitiator.cpp
+++ b/features/nfc/source/nfc/Type4RemoteInitiator.cpp
@@ -16,9 +16,9 @@
 
 #include "Type4RemoteInitiator.h"
 
-#include "acore/buffer.h"
-#include "acore/buffer_reader.h"
-#include "acore/buffer_builder.h"
+#include "acore/ac_buffer.h"
+#include "acore/ac_buffer_reader.h"
+#include "acore/ac_buffer_builder.h"
 
 #include "stack/transceiver/transceiver.h"
 #include "stack/tech/iso7816/iso7816.h"
diff --git a/features/nfc/stack/ndef/ndef.h b/features/nfc/stack/ndef/ndef.h
index 2d2b903930..f9be8cd936 100644
--- a/features/nfc/stack/ndef/ndef.h
+++ b/features/nfc/stack/ndef/ndef.h
@@ -33,8 +33,8 @@
 extern "C" {
 #endif
 
-#include "acore/buffer.h"
-#include "acore/buffer_builder.h"
+#include "acore/ac_buffer.h"
+#include "acore/ac_buffer_builder.h"
 
 //Generic interface for NDEF messages
 
diff --git a/features/nfc/stack/tech/iso7816/iso7816.h b/features/nfc/stack/tech/iso7816/iso7816.h
index e601046567..4f90bfa363 100644
--- a/features/nfc/stack/tech/iso7816/iso7816.h
+++ b/features/nfc/stack/tech/iso7816/iso7816.h
@@ -27,7 +27,7 @@
 extern "C" {
 #endif
 
-#include "acore/stream.h"
+#include "acore/ac_stream.h"
 
 #include "transceiver/protocols.h"
 #include "tech/isodep/isodep_target.h"
diff --git a/features/nfc/stack/transceiver/pn512/pn512.c b/features/nfc/stack/transceiver/pn512/pn512.c
index 348c676290..7c160c7760 100644
--- a/features/nfc/stack/transceiver/pn512/pn512.c
+++ b/features/nfc/stack/transceiver/pn512/pn512.c
@@ -29,7 +29,7 @@
 
 #include "stdlib.h"
 
-#include "acore/buffer.h"
+#include "acore/ac_buffer.h"
 
 #include "transceiver/transceiver.h"
 #include "transceiver/protocols.h"