diff --git a/src/hss/Makefile.am b/src/hss/Makefile.am
index badabf519..87566f608 100644
--- a/src/hss/Makefile.am
+++ b/src/hss/Makefile.am
@@ -3,10 +3,10 @@
 noinst_LTLIBRARIES = libhss.la
 
 libhss_la_SOURCES = \
-	milenage.h kdf.h context.h
+	milenage.h hss_kdf.h hss_ctx.h
 
 nodist_libhss_la_SOURCES = \
-	milenage.c kdf.c init.c context.c
+	milenage.c hss_kdf.c hss_init.c hss_ctx.c
 
 libhss_la_DEPENDENCIES = \
     $(top_srcdir)/lib/core/src/libcore.la \
diff --git a/src/hss/context.c b/src/hss/hss_ctx.c
similarity index 99%
rename from src/hss/context.c
rename to src/hss/hss_ctx.c
index f92984b21..a0ada09d8 100644
--- a/src/hss/context.c
+++ b/src/hss/hss_ctx.c
@@ -4,7 +4,7 @@
 #include "core_pool.h"
 #include "core_lib.h"
 
-#include "context.h"
+#include "hss_ctx.h"
 
 #define OP "5F1D289C5D354D0A140C2548F5F3E3BA"
 #define OPc "E8ED289DEBA952E4283B54E88E6183CA"
diff --git a/src/hss/context.h b/src/hss/hss_ctx.h
similarity index 94%
rename from src/hss/context.h
rename to src/hss/hss_ctx.h
index 52d10db7b..8eb9b99fb 100644
--- a/src/hss/context.h
+++ b/src/hss/hss_ctx.h
@@ -1,5 +1,5 @@
-#ifndef __CONTEXT_H__
-#define __CONTEXT_H__
+#ifndef __HSS_CTX_H__
+#define __HSS_CTX_H__
 
 #include "core_list.h"
 #include "core_errno.h"
@@ -51,4 +51,4 @@ CORE_DECLARE(ue_ctx_t*)     hss_ctx_ue_next(ue_ctx_t *ue);
 }
 #endif /* __cplusplus */
 
-#endif /* !__CONTEXT_H__ */
+#endif /* __HSS_CTX_H__ */
diff --git a/src/hss/init.c b/src/hss/hss_init.c
similarity index 99%
rename from src/hss/init.c
rename to src/hss/hss_init.c
index c33a8657b..9997b9e20 100644
--- a/src/hss/init.c
+++ b/src/hss/hss_init.c
@@ -4,12 +4,12 @@
 #include "core_lib.h"
 #include "core_sha2.h"
 
-#include "kdf.h"
-#include "milenage.h"
-
-#include "context.h"
 #include "s6a_lib.h"
 
+#include "hss_ctx.h"
+#include "hss_kdf.h"
+#include "milenage.h"
+
 #define HSS_SQN_LEN 6
 #define HSS_AK_LEN 6
 
diff --git a/src/hss/kdf.c b/src/hss/hss_kdf.c
similarity index 100%
rename from src/hss/kdf.c
rename to src/hss/hss_kdf.c
diff --git a/src/hss/kdf.h b/src/hss/hss_kdf.h
similarity index 100%
rename from src/hss/kdf.h
rename to src/hss/hss_kdf.h
diff --git a/src/mme/Makefile.am b/src/mme/Makefile.am
index b2e809a45..e130a117d 100644
--- a/src/mme/Makefile.am
+++ b/src/mme/Makefile.am
@@ -3,7 +3,7 @@
 noinst_LTLIBRARIES = libmme.la
 
 libmme_la_SOURCES = \
-	kdf.h kasumi.h snow_3g.h zuc.h \
+	mme_kdf.h kasumi.h snow_3g.h zuc.h \
     mme_event.h mme_ctx.h \
 	s1ap_build.h s1ap_handler.h s1ap_conv.h s1ap_path.h \
 	mme_s6a_handler.h \
@@ -12,7 +12,7 @@ libmme_la_SOURCES = \
 	mme_sm.h 
 
 nodist_libmme_la_SOURCES = \
-	kdf.c kasumi.c snow_3g.c zuc.c \
+	mme_kdf.c kasumi.c snow_3g.c zuc.c \
     mme_init.c mme_event.c mme_ctx.c \
 	s1ap_sm.c s1ap_build.c s1ap_handler.c s1ap_conv.c s1ap_path.c \
 	mme_s6a_handler.c \
diff --git a/src/mme/emm_handler.c b/src/mme/emm_handler.c
index 8c1878a35..bc6ce466f 100644
--- a/src/mme/emm_handler.c
+++ b/src/mme/emm_handler.c
@@ -6,7 +6,7 @@
 
 #include "mme_event.h"
 
-#include "kdf.h"
+#include "mme_kdf.h"
 #include "nas_security.h"
 #include "nas_conv.h"
 #include "mme_s6a_handler.h"
diff --git a/src/mme/esm_handler.c b/src/mme/esm_handler.c
index ed128fca2..e7e36ffbf 100644
--- a/src/mme/esm_handler.c
+++ b/src/mme/esm_handler.c
@@ -6,7 +6,7 @@
 
 #include "mme_event.h"
 
-#include "kdf.h"
+#include "mme_kdf.h"
 #include "nas_security.h"
 #include "nas_conv.h"
 #include "mme_s6a_handler.h"
diff --git a/src/mme/kdf.c b/src/mme/mme_kdf.c
similarity index 100%
rename from src/mme/kdf.c
rename to src/mme/mme_kdf.c
diff --git a/src/mme/kdf.h b/src/mme/mme_kdf.h
similarity index 100%
rename from src/mme/kdf.h
rename to src/mme/mme_kdf.h
diff --git a/test/security_test.c b/test/security_test.c
index dc7f98557..e3e81dc68 100644
--- a/test/security_test.c
+++ b/test/security_test.c
@@ -6,7 +6,7 @@
 #include "nas_message.h"
 
 #include "milenage.h"
-#include "hss/kdf.h"
+#include "hss_kdf.h"
 #include "nas_security.h"
 
 #include "testutil.h"