diff --git a/src/Filelists.mk b/src/Filelists.mk
index 146ad6ab..42281709 100644
--- a/src/Filelists.mk
+++ b/src/Filelists.mk
@@ -176,8 +176,8 @@ TFTPFILES=$(LWIPDIR)/apps/tftp/tftp_server.c
 MQTTFILES=$(LWIPDIR)/apps/mqtt/mqtt.c
 
 # ALTCP_TLS_MBEDTLS: MBEDTLS port of altcp_tls
-ALTCP_TLS_MBEDTLS=$(LWIPDIR)/apps/altcp_tls/altcp_mbedtls.c \
-	$(LWIPDIR)/apps/altcp_tls/altcp_mbedtls_mem.c
+ALTCP_TLS_MBEDTLS=$(LWIPDIR)/apps/altcp_tls/altcp_tls_mbedtls.c \
+	$(LWIPDIR)/apps/altcp_tls/altcp_tls_mbedtls_mem.c
 
 # LWIPAPPFILES: All LWIP APPs
 LWIPAPPFILES=$(SNMPFILES) \
diff --git a/src/apps/altcp_tls/altcp_mbedtls.c b/src/apps/altcp_tls/altcp_tls_mbedtls.c
similarity index 99%
rename from src/apps/altcp_tls/altcp_mbedtls.c
rename to src/apps/altcp_tls/altcp_tls_mbedtls.c
index b2ec53df..627b516a 100644
--- a/src/apps/altcp_tls/altcp_mbedtls.c
+++ b/src/apps/altcp_tls/altcp_tls_mbedtls.c
@@ -64,8 +64,8 @@
 #include "lwip/apps/altcp_tls.h"
 #include "lwip/priv/altcp_priv.h"
 
-#include "altcp_mbedtls_structs.h"
-#include "altcp_mbedtls_mem.h"
+#include "altcp_tls_mbedtls_structs.h"
+#include "altcp_tls_mbedtls_mem.h"
 
 /* @todo: which includes are really needed? */
 #include "mbedtls/entropy.h"
diff --git a/src/apps/altcp_tls/altcp_mbedtls_mem.c b/src/apps/altcp_tls/altcp_tls_mbedtls_mem.c
similarity index 98%
rename from src/apps/altcp_tls/altcp_mbedtls_mem.c
rename to src/apps/altcp_tls/altcp_tls_mbedtls_mem.c
index eba232c5..a4a74339 100644
--- a/src/apps/altcp_tls/altcp_mbedtls_mem.c
+++ b/src/apps/altcp_tls/altcp_tls_mbedtls_mem.c
@@ -52,8 +52,8 @@
 
 #if LWIP_ALTCP /* don't build if not configured for use in lwipopts.h */
 
-#include "altcp_mbedtls_mem.h"
-#include "altcp_mbedtls_structs.h"
+#include "altcp_tls_mbedtls_mem.h"
+#include "altcp_tls_mbedtls_structs.h"
 #include "lwip/mem.h"
 
 #include "mbedtls/platform.h"
diff --git a/src/apps/altcp_tls/altcp_mbedtls_mem.h b/src/apps/altcp_tls/altcp_tls_mbedtls_mem.h
similarity index 98%
rename from src/apps/altcp_tls/altcp_mbedtls_mem.h
rename to src/apps/altcp_tls/altcp_tls_mbedtls_mem.h
index e1c21741..a5610ba8 100644
--- a/src/apps/altcp_tls/altcp_mbedtls_mem.h
+++ b/src/apps/altcp_tls/altcp_tls_mbedtls_mem.h
@@ -47,7 +47,7 @@
 
 #if LWIP_ALTCP /* don't build if not configured for use in lwipopts.h */
 
-#include "altcp_mbedtls_structs.h"
+#include "altcp_tls_mbedtls_structs.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/apps/altcp_tls/altcp_mbedtls_structs.h b/src/apps/altcp_tls/altcp_tls_mbedtls_structs.h
similarity index 100%
rename from src/apps/altcp_tls/altcp_mbedtls_structs.h
rename to src/apps/altcp_tls/altcp_tls_mbedtls_structs.h