diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 2c1bccb..220fbf9 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -47,8 +47,8 @@
     md4.c
     md5.c
     memory_buffer_alloc.c
-    mps/reader.c
-    mps/trace.o
+    mps_reader.c
+    mps_trace.c
     nist_kw.c
     oid.c
     padlock.c
diff --git a/library/Makefile b/library/Makefile
index 0fb6eeb..419291a 100644
--- a/library/Makefile
+++ b/library/Makefile
@@ -104,8 +104,8 @@
 	     md4.o \
 	     md5.o \
 	     memory_buffer_alloc.o \
-             mps/reader.o \
-             mps/trace.o \
+             mps_reader.o \
+             mps_trace.o \
 	     nist_kw.o \
 	     oid.o \
 	     padlock.o \
diff --git a/library/mps/common.h b/library/mps_common.h
similarity index 100%
rename from library/mps/common.h
rename to library/mps_common.h
diff --git a/library/mps/error.h b/library/mps_error.h
similarity index 100%
rename from library/mps/error.h
rename to library/mps_error.h
diff --git a/library/mps/reader.c b/library/mps_reader.c
similarity index 99%
rename from library/mps/reader.c
rename to library/mps_reader.c
index 791b8bd..e6fbb07 100644
--- a/library/mps/reader.c
+++ b/library/mps_reader.c
@@ -19,9 +19,9 @@
  *  This file is part of Mbed TLS (https://tls.mbed.org)
  */
 
-#include "reader.h"
-#include "common.h"
-#include "trace.h"
+#include "mps_reader.h"
+#include "mps_common.h"
+#include "mps_trace.h"
 
 #include <string.h>
 
diff --git a/library/mps/reader.h b/library/mps_reader.h
similarity index 99%
rename from library/mps/reader.h
rename to library/mps_reader.h
index 5801e1c..4039170 100644
--- a/library/mps/reader.h
+++ b/library/mps_reader.h
@@ -116,8 +116,8 @@
 
 #include <stdio.h>
 
-#include "common.h"
-#include "error.h"
+#include "mps_common.h"
+#include "mps_error.h"
 
 struct mbedtls_reader;
 typedef struct mbedtls_reader mbedtls_reader;
diff --git a/library/mps/trace.c b/library/mps_trace.c
similarity index 97%
rename from library/mps/trace.c
rename to library/mps_trace.c
index 61965dc..06c6e26 100644
--- a/library/mps/trace.c
+++ b/library/mps_trace.c
@@ -19,11 +19,11 @@
  *  This file is part of Mbed TLS (https://tls.mbed.org)
  */
 
-#include "common.h"
+#include "mps_common.h"
 
 #if defined(MBEDTLS_MPS_TRACE)
 
-#include "trace.h"
+#include "mps_trace.h"
 #include <stdarg.h>
 
 static int trace_depth_ = 0;
diff --git a/library/mps/trace.h b/library/mps_trace.h
similarity index 98%
rename from library/mps/trace.h
rename to library/mps_trace.h
index b1da7ed..f03ba9a 100644
--- a/library/mps/trace.h
+++ b/library/mps_trace.h
@@ -27,10 +27,9 @@
 #define MBEDTLS_MPS_TRACE_H
 
 #include "common.h"
+#include "mps_common.h"
+#include "mps_trace.h"
 
-#include "../common.h"
-
-#include "trace.h"
 #if defined(MBEDTLS_PLATFORM_C)
 #include "mbedtls/platform.h"
 #else