diff --git a/eap_example/Makefile b/eap_example/Makefile
index be4f6b6a6..0cc19bd53 100644
--- a/eap_example/Makefile
+++ b/eap_example/Makefile
@@ -78,20 +78,20 @@ CFLAGS += -DIEEE8021X_EAPOL
 
 
 # Optional components to add EAP server support
-OBJS_server += ../src/eap_server/eap_tls.o
-OBJS_server += ../src/eap_server/eap_peap.o
-OBJS_server += ../src/eap_server/eap_ttls.o
-OBJS_server += ../src/eap_server/eap_md5.o
-OBJS_server += ../src/eap_server/eap_mschapv2.o
-OBJS_server += ../src/eap_server/eap_gtc.o
-OBJS_server += ../src/eap_server/eap_psk.o
-OBJS_server += ../src/eap_server/eap_pax.o
-OBJS_server += ../src/eap_server/eap_sake.o
-OBJS_server += ../src/eap_server/eap_gpsk.o
-OBJS_server += ../src/eap_server/eap.o
-OBJS_server += ../src/eap_server/eap_identity.o
-OBJS_server += ../src/eap_server/eap_methods.o
-OBJS_server += ../src/eap_server/eap_tls_common.o
+OBJS_server += ../src/eap_server/eap_server_tls.o
+OBJS_server += ../src/eap_server/eap_server_peap.o
+OBJS_server += ../src/eap_server/eap_server_ttls.o
+OBJS_server += ../src/eap_server/eap_server_md5.o
+OBJS_server += ../src/eap_server/eap_server_mschapv2.o
+OBJS_server += ../src/eap_server/eap_server_gtc.o
+OBJS_server += ../src/eap_server/eap_server_psk.o
+OBJS_server += ../src/eap_server/eap_server_pax.o
+OBJS_server += ../src/eap_server/eap_server_sake.o
+OBJS_server += ../src/eap_server/eap_server_gpsk.o
+OBJS_server += ../src/eap_server/eap_server.o
+OBJS_server += ../src/eap_server/eap_server_identity.o
+OBJS_server += ../src/eap_server/eap_server_methods.o
+OBJS_server += ../src/eap_server/eap_server_tls_common.o
 CFLAGS += -DEAP_SERVER
 
 
diff --git a/hostapd/Makefile b/hostapd/Makefile
index 6594df0c6..c1891dc21 100644
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -182,19 +182,19 @@ endif
 
 ifdef CONFIG_EAP_MD5
 CFLAGS += -DEAP_SERVER_MD5
-OBJS += ../src/eap_server/eap_md5.o
+OBJS += ../src/eap_server/eap_server_md5.o
 CHAP=y
 endif
 
 ifdef CONFIG_EAP_TLS
 CFLAGS += -DEAP_SERVER_TLS
-OBJS += ../src/eap_server/eap_tls.o
+OBJS += ../src/eap_server/eap_server_tls.o
 TLS_FUNCS=y
 endif
 
 ifdef CONFIG_EAP_PEAP
 CFLAGS += -DEAP_SERVER_PEAP
-OBJS += ../src/eap_server/eap_peap.o
+OBJS += ../src/eap_server/eap_server_peap.o
 OBJS += ../src/eap_common/eap_peap_common.o
 TLS_FUNCS=y
 CONFIG_EAP_MSCHAPV2=y
@@ -202,32 +202,32 @@ endif
 
 ifdef CONFIG_EAP_TTLS
 CFLAGS += -DEAP_SERVER_TTLS
-OBJS += ../src/eap_server/eap_ttls.o
+OBJS += ../src/eap_server/eap_server_ttls.o
 TLS_FUNCS=y
 CHAP=y
 endif
 
 ifdef CONFIG_EAP_MSCHAPV2
 CFLAGS += -DEAP_SERVER_MSCHAPV2
-OBJS += ../src/eap_server/eap_mschapv2.o
+OBJS += ../src/eap_server/eap_server_mschapv2.o
 MS_FUNCS=y
 endif
 
 ifdef CONFIG_EAP_GTC
 CFLAGS += -DEAP_SERVER_GTC
-OBJS += ../src/eap_server/eap_gtc.o
+OBJS += ../src/eap_server/eap_server_gtc.o
 endif
 
 ifdef CONFIG_EAP_SIM
 CFLAGS += -DEAP_SERVER_SIM
-OBJS += ../src/eap_server/eap_sim.o
+OBJS += ../src/eap_server/eap_server_sim.o
 CONFIG_EAP_SIM_COMMON=y
 NEED_AES_CBC=y
 endif
 
 ifdef CONFIG_EAP_AKA
 CFLAGS += -DEAP_SERVER_AKA
-OBJS += ../src/eap_server/eap_aka.o
+OBJS += ../src/eap_server/eap_server_aka.o
 CONFIG_EAP_SIM_COMMON=y
 NEED_SHA256=y
 NEED_AES_CBC=y
@@ -248,12 +248,12 @@ endif
 
 ifdef CONFIG_EAP_PAX
 CFLAGS += -DEAP_SERVER_PAX
-OBJS += ../src/eap_server/eap_pax.o ../src/eap_common/eap_pax_common.o
+OBJS += ../src/eap_server/eap_server_pax.o ../src/eap_common/eap_pax_common.o
 endif
 
 ifdef CONFIG_EAP_PSK
 CFLAGS += -DEAP_SERVER_PSK
-OBJS += ../src/eap_server/eap_psk.o ../src/eap_common/eap_psk_common.o
+OBJS += ../src/eap_server/eap_server_psk.o ../src/eap_common/eap_psk_common.o
 NEED_AES_OMAC1=y
 NEED_AES_ENCBLOCK=y
 NEED_AES_EAX=y
@@ -261,12 +261,12 @@ endif
 
 ifdef CONFIG_EAP_SAKE
 CFLAGS += -DEAP_SERVER_SAKE
-OBJS += ../src/eap_server/eap_sake.o ../src/eap_common/eap_sake_common.o
+OBJS += ../src/eap_server/eap_server_sake.o ../src/eap_common/eap_sake_common.o
 endif
 
 ifdef CONFIG_EAP_GPSK
 CFLAGS += -DEAP_SERVER_GPSK
-OBJS += ../src/eap_server/eap_gpsk.o ../src/eap_common/eap_gpsk_common.o
+OBJS += ../src/eap_server/eap_server_gpsk.o ../src/eap_common/eap_gpsk_common.o
 ifdef CONFIG_EAP_GPSK_SHA256
 CFLAGS += -DEAP_SERVER_GPSK_SHA256
 endif
@@ -276,12 +276,12 @@ endif
 
 ifdef CONFIG_EAP_VENDOR_TEST
 CFLAGS += -DEAP_SERVER_VENDOR_TEST
-OBJS += ../src/eap_server/eap_vendor_test.o
+OBJS += ../src/eap_server/eap_server_vendor_test.o
 endif
 
 ifdef CONFIG_EAP_FAST
 CFLAGS += -DEAP_SERVER_FAST
-OBJS += ../src/eap_server/eap_fast.o
+OBJS += ../src/eap_server/eap_server_fast.o
 OBJS += ../src/eap_common/eap_fast_common.o
 TLS_FUNCS=y
 NEED_T_PRF=y
@@ -292,7 +292,7 @@ ifdef CONFIG_WPS
 CFLAGS += -DCONFIG_WPS -DEAP_SERVER_WSC
 OBJS += ../src/utils/uuid.o
 OBJS += ../src/ap/wps_hostapd.o
-OBJS += ../src/eap_server/eap_wsc.o ../src/eap_common/eap_wsc_common.o
+OBJS += ../src/eap_server/eap_server_wsc.o ../src/eap_common/eap_wsc_common.o
 OBJS += ../src/wps/wps.o
 OBJS += ../src/wps/wps_common.o
 OBJS += ../src/wps/wps_attr_parse.o
@@ -349,7 +349,7 @@ endif
 
 ifdef CONFIG_EAP_IKEV2
 CFLAGS += -DEAP_SERVER_IKEV2
-OBJS += ../src/eap_server/eap_ikev2.o ../src/eap_server/ikev2.o
+OBJS += ../src/eap_server/eap_server_ikev2.o ../src/eap_server/ikev2.o
 OBJS += ../src/eap_common/eap_ikev2_common.o ../src/eap_common/ikev2_common.o
 NEED_DH_GROUPS=y
 NEED_DH_GROUPS_ALL=y
@@ -359,7 +359,7 @@ endif
 
 ifdef CONFIG_EAP_TNC
 CFLAGS += -DEAP_SERVER_TNC
-OBJS += ../src/eap_server/eap_tnc.o
+OBJS += ../src/eap_server/eap_server_tnc.o
 OBJS += ../src/eap_server/tncs.o
 NEED_BASE64=y
 ifndef CONFIG_DRIVER_BSD
@@ -369,10 +369,10 @@ endif
 
 # Basic EAP functionality is needed for EAPOL
 OBJS += eap_register.o
-OBJS += ../src/eap_server/eap.o
+OBJS += ../src/eap_server/eap_server.o
 OBJS += ../src/eap_common/eap_common.o
-OBJS += ../src/eap_server/eap_methods.o
-OBJS += ../src/eap_server/eap_identity.o
+OBJS += ../src/eap_server/eap_server_methods.o
+OBJS += ../src/eap_server/eap_server_identity.o
 CFLAGS += -DEAP_SERVER_IDENTITY
 
 ifdef CONFIG_EAP
@@ -397,7 +397,7 @@ ifdef TLS_FUNCS
 NEED_DES=y
 # Shared TLS functions (needed for EAP_TLS, EAP_PEAP, and EAP_TTLS)
 CFLAGS += -DEAP_TLS_FUNCS
-OBJS += ../src/eap_server/eap_tls_common.o
+OBJS += ../src/eap_server/eap_server_tls_common.o
 NEED_TLS_PRF=y
 endif
 
diff --git a/src/eap_server/eap.c b/src/eap_server/eap_server.c
similarity index 100%
rename from src/eap_server/eap.c
rename to src/eap_server/eap_server.c
diff --git a/src/eap_server/eap_aka.c b/src/eap_server/eap_server_aka.c
similarity index 100%
rename from src/eap_server/eap_aka.c
rename to src/eap_server/eap_server_aka.c
diff --git a/src/eap_server/eap_fast.c b/src/eap_server/eap_server_fast.c
similarity index 100%
rename from src/eap_server/eap_fast.c
rename to src/eap_server/eap_server_fast.c
diff --git a/src/eap_server/eap_gpsk.c b/src/eap_server/eap_server_gpsk.c
similarity index 100%
rename from src/eap_server/eap_gpsk.c
rename to src/eap_server/eap_server_gpsk.c
diff --git a/src/eap_server/eap_gtc.c b/src/eap_server/eap_server_gtc.c
similarity index 100%
rename from src/eap_server/eap_gtc.c
rename to src/eap_server/eap_server_gtc.c
diff --git a/src/eap_server/eap_identity.c b/src/eap_server/eap_server_identity.c
similarity index 100%
rename from src/eap_server/eap_identity.c
rename to src/eap_server/eap_server_identity.c
diff --git a/src/eap_server/eap_ikev2.c b/src/eap_server/eap_server_ikev2.c
similarity index 100%
rename from src/eap_server/eap_ikev2.c
rename to src/eap_server/eap_server_ikev2.c
diff --git a/src/eap_server/eap_md5.c b/src/eap_server/eap_server_md5.c
similarity index 100%
rename from src/eap_server/eap_md5.c
rename to src/eap_server/eap_server_md5.c
diff --git a/src/eap_server/eap_methods.c b/src/eap_server/eap_server_methods.c
similarity index 100%
rename from src/eap_server/eap_methods.c
rename to src/eap_server/eap_server_methods.c
diff --git a/src/eap_server/eap_mschapv2.c b/src/eap_server/eap_server_mschapv2.c
similarity index 100%
rename from src/eap_server/eap_mschapv2.c
rename to src/eap_server/eap_server_mschapv2.c
diff --git a/src/eap_server/eap_pax.c b/src/eap_server/eap_server_pax.c
similarity index 100%
rename from src/eap_server/eap_pax.c
rename to src/eap_server/eap_server_pax.c
diff --git a/src/eap_server/eap_peap.c b/src/eap_server/eap_server_peap.c
similarity index 100%
rename from src/eap_server/eap_peap.c
rename to src/eap_server/eap_server_peap.c
diff --git a/src/eap_server/eap_psk.c b/src/eap_server/eap_server_psk.c
similarity index 100%
rename from src/eap_server/eap_psk.c
rename to src/eap_server/eap_server_psk.c
diff --git a/src/eap_server/eap_sake.c b/src/eap_server/eap_server_sake.c
similarity index 100%
rename from src/eap_server/eap_sake.c
rename to src/eap_server/eap_server_sake.c
diff --git a/src/eap_server/eap_sim.c b/src/eap_server/eap_server_sim.c
similarity index 100%
rename from src/eap_server/eap_sim.c
rename to src/eap_server/eap_server_sim.c
diff --git a/src/eap_server/eap_tls.c b/src/eap_server/eap_server_tls.c
similarity index 100%
rename from src/eap_server/eap_tls.c
rename to src/eap_server/eap_server_tls.c
diff --git a/src/eap_server/eap_tls_common.c b/src/eap_server/eap_server_tls_common.c
similarity index 100%
rename from src/eap_server/eap_tls_common.c
rename to src/eap_server/eap_server_tls_common.c
diff --git a/src/eap_server/eap_tnc.c b/src/eap_server/eap_server_tnc.c
similarity index 100%
rename from src/eap_server/eap_tnc.c
rename to src/eap_server/eap_server_tnc.c
diff --git a/src/eap_server/eap_ttls.c b/src/eap_server/eap_server_ttls.c
similarity index 100%
rename from src/eap_server/eap_ttls.c
rename to src/eap_server/eap_server_ttls.c
diff --git a/src/eap_server/eap_vendor_test.c b/src/eap_server/eap_server_vendor_test.c
similarity index 100%
rename from src/eap_server/eap_vendor_test.c
rename to src/eap_server/eap_server_vendor_test.c
diff --git a/src/eap_server/eap_wsc.c b/src/eap_server/eap_server_wsc.c
similarity index 100%
rename from src/eap_server/eap_wsc.c
rename to src/eap_server/eap_server_wsc.c
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index b7fcdf2dc..20ec31f25 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -217,7 +217,7 @@ EAPDYN += ../src/eap_peer/eap_tls.so
 else
 CFLAGS += -DEAP_TLS
 OBJS += ../src/eap_peer/eap_tls.o
-OBJS_h += ../src/eap_server/eap_tls.o
+OBJS_h += ../src/eap_server/eap_server_tls.o
 endif
 TLS_FUNCS=y
 CONFIG_IEEE8021X_EAPOL=y
@@ -232,7 +232,7 @@ else
 CFLAGS += -DEAP_PEAP
 OBJS += ../src/eap_peer/eap_peap.o
 OBJS += ../src/eap_common/eap_peap_common.o
-OBJS_h += ../src/eap_server/eap_peap.o
+OBJS_h += ../src/eap_server/eap_server_peap.o
 endif
 TLS_FUNCS=y
 CONFIG_IEEE8021X_EAPOL=y
@@ -246,7 +246,7 @@ EAPDYN += ../src/eap_peer/eap_ttls.so
 else
 CFLAGS += -DEAP_TTLS
 OBJS += ../src/eap_peer/eap_ttls.o
-OBJS_h += ../src/eap_server/eap_ttls.o
+OBJS_h += ../src/eap_server/eap_server_ttls.o
 endif
 MS_FUNCS=y
 TLS_FUNCS=y
@@ -262,7 +262,7 @@ EAPDYN += ../src/eap_peer/eap_md5.so
 else
 CFLAGS += -DEAP_MD5
 OBJS += ../src/eap_peer/eap_md5.o
-OBJS_h += ../src/eap_server/eap_md5.o
+OBJS_h += ../src/eap_server/eap_server_md5.o
 endif
 CHAP=y
 CONFIG_IEEE8021X_EAPOL=y
@@ -285,7 +285,7 @@ else
 CFLAGS += -DEAP_MSCHAPv2
 OBJS += ../src/eap_peer/eap_mschapv2.o
 OBJS += ../src/eap_peer/mschapv2.o
-OBJS_h += ../src/eap_server/eap_mschapv2.o
+OBJS_h += ../src/eap_server/eap_server_mschapv2.o
 endif
 MS_FUNCS=y
 CONFIG_IEEE8021X_EAPOL=y
@@ -299,7 +299,7 @@ EAPDYN += ../src/eap_peer/eap_gtc.so
 else
 CFLAGS += -DEAP_GTC
 OBJS += ../src/eap_peer/eap_gtc.o
-OBJS_h += ../src/eap_server/eap_gtc.o
+OBJS_h += ../src/eap_server/eap_server_gtc.o
 endif
 CONFIG_IEEE8021X_EAPOL=y
 endif
@@ -324,7 +324,7 @@ EAPDYN += ../src/eap_peer/eap_sim.so
 else
 CFLAGS += -DEAP_SIM
 OBJS += ../src/eap_peer/eap_sim.o
-OBJS_h += ../src/eap_server/eap_sim.o
+OBJS_h += ../src/eap_server/eap_server_sim.o
 endif
 CONFIG_IEEE8021X_EAPOL=y
 CONFIG_EAP_SIM_COMMON=y
@@ -352,7 +352,7 @@ EAPDYN += ../src/eap_peer/eap_psk.so
 else
 CFLAGS += -DEAP_PSK
 OBJS += ../src/eap_peer/eap_psk.o ../src/eap_common/eap_psk_common.o
-OBJS_h += ../src/eap_server/eap_psk.o
+OBJS_h += ../src/eap_server/eap_server_psk.o
 endif
 CONFIG_IEEE8021X_EAPOL=y
 NEED_AES=y
@@ -369,7 +369,7 @@ EAPDYN += ../src/eap_peer/eap_aka.so
 else
 CFLAGS += -DEAP_AKA
 OBJS += ../src/eap_peer/eap_aka.o
-OBJS_h += ../src/eap_server/eap_aka.o
+OBJS_h += ../src/eap_server/eap_server_aka.o
 endif
 CONFIG_IEEE8021X_EAPOL=y
 CONFIG_EAP_SIM_COMMON=y
@@ -403,7 +403,7 @@ else
 CFLAGS += -DEAP_FAST
 OBJS += ../src/eap_peer/eap_fast.o ../src/eap_peer/eap_fast_pac.o
 OBJS += ../src/eap_common/eap_fast_common.o
-OBJS_h += ../src/eap_server/eap_fast.o
+OBJS_h += ../src/eap_server/eap_server_fast.o
 endif
 TLS_FUNCS=y
 CONFIG_IEEE8021X_EAPOL=y
@@ -418,7 +418,7 @@ EAPDYN += ../src/eap_peer/eap_pax.so
 else
 CFLAGS += -DEAP_PAX
 OBJS += ../src/eap_peer/eap_pax.o ../src/eap_common/eap_pax_common.o
-OBJS_h += ../src/eap_server/eap_pax.o
+OBJS_h += ../src/eap_server/eap_server_pax.o
 endif
 CONFIG_IEEE8021X_EAPOL=y
 endif
@@ -431,7 +431,7 @@ EAPDYN += ../src/eap_peer/eap_sake.so
 else
 CFLAGS += -DEAP_SAKE
 OBJS += ../src/eap_peer/eap_sake.o ../src/eap_common/eap_sake_common.o
-OBJS_h += ../src/eap_server/eap_sake.o
+OBJS_h += ../src/eap_server/eap_server_sake.o
 endif
 CONFIG_IEEE8021X_EAPOL=y
 endif
@@ -444,7 +444,7 @@ EAPDYN += ../src/eap_peer/eap_gpsk.so
 else
 CFLAGS += -DEAP_GPSK
 OBJS += ../src/eap_peer/eap_gpsk.o ../src/eap_common/eap_gpsk_common.o
-OBJS_h += ../src/eap_server/eap_gpsk.o
+OBJS_h += ../src/eap_server/eap_server_gpsk.o
 endif
 CONFIG_IEEE8021X_EAPOL=y
 ifdef CONFIG_EAP_GPSK_SHA256
@@ -468,7 +468,7 @@ OBJS += ../src/wps/wps_attr_process.o
 OBJS += ../src/wps/wps_dev_attr.o
 OBJS += ../src/wps/wps_enrollee.o
 OBJS += ../src/wps/wps_registrar.o
-OBJS_h += ../src/eap_server/eap_wsc.o
+OBJS_h += ../src/eap_server/eap_server_wsc.o
 CONFIG_IEEE8021X_EAPOL=y
 NEED_DH_GROUPS=y
 NEED_SHA256=y
@@ -534,7 +534,7 @@ else
 CFLAGS += -DEAP_IKEV2
 OBJS += ../src/eap_peer/eap_ikev2.o ../src/eap_peer/ikev2.o
 OBJS += ../src/eap_common/eap_ikev2_common.o ../src/eap_common/ikev2_common.o
-OBJS_h += ../src/eap_server/eap_ikev2.o
+OBJS_h += ../src/eap_server/eap_server_ikev2.o
 OBJS_h += ../src/eap_server/ikev2.o
 endif
 CONFIG_IEEE8021X_EAPOL=y
@@ -551,7 +551,7 @@ EAPDYN += ../src/eap_peer/eap_vendor_test.so
 else
 CFLAGS += -DEAP_VENDOR_TEST
 OBJS += ../src/eap_peer/eap_vendor_test.o
-OBJS_h += ../src/eap_server/eap_vendor_test.o
+OBJS_h += ../src/eap_server/eap_server_vendor_test.o
 endif
 CONFIG_IEEE8021X_EAPOL=y
 endif
@@ -561,7 +561,7 @@ ifdef CONFIG_EAP_TNC
 CFLAGS += -DEAP_TNC
 OBJS += ../src/eap_peer/eap_tnc.o
 OBJS += ../src/eap_peer/tncc.o
-OBJS_h += ../src/eap_server/eap_tnc.o
+OBJS_h += ../src/eap_server/eap_server_tnc.o
 OBJS_h += ../src/eap_server/tncs.o
 NEED_BASE64=y
 ifndef CONFIG_NATIVE_WINDOWS
@@ -607,9 +607,9 @@ OBJS += ../src/ap/ctrl_iface_ap.o
 endif
 
 CFLAGS += -DEAP_SERVER -DEAP_SERVER_IDENTITY
-OBJS += ../src/eap_server/eap.o
-OBJS += ../src/eap_server/eap_identity.o
-OBJS += ../src/eap_server/eap_methods.o
+OBJS += ../src/eap_server/eap_server.o
+OBJS += ../src/eap_server/eap_server_identity.o
+OBJS += ../src/eap_server/eap_server_methods.o
 
 ifdef CONFIG_IEEE80211N
 CFLAGS += -DCONFIG_IEEE80211N
@@ -629,7 +629,7 @@ endif
 ifdef CONFIG_WPS
 CFLAGS += -DEAP_SERVER_WSC
 OBJS += ../src/ap/wps_hostapd.o
-OBJS += ../src/eap_server/eap_wsc.o
+OBJS += ../src/eap_server/eap_server_wsc.o
 endif
 endif
 
@@ -649,9 +649,9 @@ endif
 
 ifdef CONFIG_EAP_SERVER
 CFLAGS += -DEAP_SERVER
-OBJS_h += ../src/eap_server/eap.o
-OBJS_h += ../src/eap_server/eap_identity.o
-OBJS_h += ../src/eap_server/eap_methods.o
+OBJS_h += ../src/eap_server/eap_server.o
+OBJS_h += ../src/eap_server/eap_server_identity.o
+OBJS_h += ../src/eap_server/eap_server_methods.o
 endif
 
 ifdef CONFIG_RADIUS_CLIENT
@@ -727,7 +727,7 @@ ifdef TLS_FUNCS
 NEED_DES=y
 # Shared TLS functions (needed for EAP_TLS, EAP_PEAP, EAP_TTLS, and EAP_FAST)
 OBJS += ../src/eap_peer/eap_tls_common.o
-OBJS_h += ../src/eap_server/eap_tls_common.o
+OBJS_h += ../src/eap_server/eap_server_tls_common.o
 NEED_TLS_PRF=y
 endif