diff --git a/EAPMethods/EAPTTLS/StdAfx.h b/EAPMethods/EAPTTLS/StdAfx.h
index 5cb5671..202a091 100644
--- a/EAPMethods/EAPTTLS/StdAfx.h
+++ b/EAPMethods/EAPTTLS/StdAfx.h
@@ -20,5 +20,5 @@
 
 #pragma once
 
+#include "../../lib/TTLS/include/Method.h"
 #include "../../lib/TTLS/include/Module.h"
-#include "../../lib/TTLS/include/Session.h"
diff --git a/lib/EAPBase/build/EAPBase.vcxproj b/lib/EAPBase/build/EAPBase.vcxproj
index f58506a..3b7c1a7 100644
--- a/lib/EAPBase/build/EAPBase.vcxproj
+++ b/lib/EAPBase/build/EAPBase.vcxproj
@@ -83,15 +83,15 @@
     <ClInclude Include="..\include\Credentials.h" />
     <ClInclude Include="..\include\EAP.h" />
     <ClInclude Include="..\include\EAPXML.h" />
+    <ClInclude Include="..\include\Method.h" />
     <ClInclude Include="..\include\Module.h" />
-    <ClInclude Include="..\include\Session.h" />
     <ClInclude Include="..\src\StdAfx.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\Config.cpp" />
     <ClCompile Include="..\src\Credentials.cpp" />
     <ClCompile Include="..\src\Module.cpp" />
-    <ClCompile Include="..\src\Session.cpp" />
+    <ClCompile Include="..\src\Method.cpp" />
     <ClCompile Include="..\src\StdAfx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
diff --git a/lib/EAPBase/build/EAPBase.vcxproj.filters b/lib/EAPBase/build/EAPBase.vcxproj.filters
index 94c314a..2f249ca 100644
--- a/lib/EAPBase/build/EAPBase.vcxproj.filters
+++ b/lib/EAPBase/build/EAPBase.vcxproj.filters
@@ -20,7 +20,7 @@
     <ClInclude Include="..\include\EAPXML.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\Session.h">
+    <ClInclude Include="..\include\Method.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\Config.h">
@@ -43,10 +43,10 @@
     <ClCompile Include="..\src\Credentials.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Module.cpp">
+    <ClCompile Include="..\src\Method.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Session.cpp">
+    <ClCompile Include="..\src\Module.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/lib/EAPBase/include/Session.h b/lib/EAPBase/include/Method.h
similarity index 100%
rename from lib/EAPBase/include/Session.h
rename to lib/EAPBase/include/Method.h
diff --git a/lib/EAPBase/src/Session.cpp b/lib/EAPBase/src/Method.cpp
similarity index 100%
rename from lib/EAPBase/src/Session.cpp
rename to lib/EAPBase/src/Method.cpp
diff --git a/lib/EAPBase/src/StdAfx.h b/lib/EAPBase/src/StdAfx.h
index 31224be..c0c1c30 100644
--- a/lib/EAPBase/src/StdAfx.h
+++ b/lib/EAPBase/src/StdAfx.h
@@ -22,8 +22,8 @@
 
 #include "../include/Config.h"
 #include "../include/Credentials.h"
+#include "../include/Method.h"
 #include "../include/Module.h"
-#include "../include/Session.h"
 
 #include "../include/EAP.h"
 #include "../include/EAPXML.h"
diff --git a/lib/TLS/build/TLS.vcxproj b/lib/TLS/build/TLS.vcxproj
index 85b4ca7..82266ce 100644
--- a/lib/TLS/build/TLS.vcxproj
+++ b/lib/TLS/build/TLS.vcxproj
@@ -81,12 +81,12 @@
   <ItemGroup>
     <ClInclude Include="..\include\Config.h" />
     <ClInclude Include="..\include\Credentials.h" />
-    <ClInclude Include="..\include\Session.h" />
+    <ClInclude Include="..\include\Method.h" />
     <ClInclude Include="..\src\StdAfx.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\Config.cpp" />
-    <ClCompile Include="..\src\Session.cpp" />
+    <ClCompile Include="..\src\Method.cpp" />
     <ClCompile Include="..\src\StdAfx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
diff --git a/lib/TLS/build/TLS.vcxproj.filters b/lib/TLS/build/TLS.vcxproj.filters
index 587889a..8c96e75 100644
--- a/lib/TLS/build/TLS.vcxproj.filters
+++ b/lib/TLS/build/TLS.vcxproj.filters
@@ -20,7 +20,7 @@
     <ClInclude Include="..\include\Credentials.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\Session.h">
+    <ClInclude Include="..\include\Method.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
@@ -34,7 +34,7 @@
     <ClCompile Include="..\src\Credentials.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Session.cpp">
+    <ClCompile Include="..\src\Method.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/lib/TLS/include/Session.h b/lib/TLS/include/Method.h
similarity index 96%
rename from lib/TLS/include/Session.h
rename to lib/TLS/include/Method.h
index bab98e2..8ec0418 100644
--- a/lib/TLS/include/Session.h
+++ b/lib/TLS/include/Method.h
@@ -43,7 +43,7 @@ namespace eap
 #include "../include/Config.h"
 #include "../include/Credentials.h"
 
-#include "../../EAPBase/include/Session.h"
+#include "../../EAPBase/include/Method.h"
 
 #include <WinStd/Common.h>
 #include <WinStd/Crypt.h>
diff --git a/lib/TLS/src/Session.cpp b/lib/TLS/src/Method.cpp
similarity index 100%
rename from lib/TLS/src/Session.cpp
rename to lib/TLS/src/Method.cpp
diff --git a/lib/TLS/src/StdAfx.h b/lib/TLS/src/StdAfx.h
index 59e752a..fb99dd8 100644
--- a/lib/TLS/src/StdAfx.h
+++ b/lib/TLS/src/StdAfx.h
@@ -22,7 +22,7 @@
 
 #include "../include/Config.h"
 #include "../include/Credentials.h"
-#include "../include/Session.h"
+#include "../include/Method.h"
 
 #include "../../EAPBase/include/EAPXML.h"
 
diff --git a/lib/TTLS/build/TTLS.vcxproj b/lib/TTLS/build/TTLS.vcxproj
index 04f5760..0f5716f 100644
--- a/lib/TTLS/build/TTLS.vcxproj
+++ b/lib/TTLS/build/TTLS.vcxproj
@@ -81,15 +81,15 @@
   <ItemGroup>
     <ClInclude Include="..\include\Config.h" />
     <ClInclude Include="..\include\Credentials.h" />
+    <ClInclude Include="..\include\Method.h" />
     <ClInclude Include="..\include\Module.h" />
-    <ClInclude Include="..\include\Session.h" />
     <ClInclude Include="..\src\StdAfx.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\Config.cpp" />
     <ClCompile Include="..\src\Credentials.cpp" />
+    <ClCompile Include="..\src\Method.cpp" />
     <ClCompile Include="..\src\Module.cpp" />
-    <ClCompile Include="..\src\Session.cpp" />
     <ClCompile Include="..\src\StdAfx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
diff --git a/lib/TTLS/build/TTLS.vcxproj.filters b/lib/TTLS/build/TTLS.vcxproj.filters
index e8c5b2d..5cd912e 100644
--- a/lib/TTLS/build/TTLS.vcxproj.filters
+++ b/lib/TTLS/build/TTLS.vcxproj.filters
@@ -20,7 +20,7 @@
     <ClInclude Include="..\include\Credentials.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\Session.h">
+    <ClInclude Include="..\include\Method.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\Module.h">
@@ -37,10 +37,10 @@
     <ClCompile Include="..\src\Credentials.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Module.cpp">
+    <ClCompile Include="..\src\Method.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Session.cpp">
+    <ClCompile Include="..\src\Module.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/lib/TTLS/include/Session.h b/lib/TTLS/include/Method.h
similarity index 94%
rename from lib/TTLS/include/Session.h
rename to lib/TTLS/include/Method.h
index ff67432..ace0995 100644
--- a/lib/TTLS/include/Session.h
+++ b/lib/TTLS/include/Method.h
@@ -35,8 +35,11 @@ namespace eap
 
 #pragma once
 
-#include "../../TLS/include/Session.h"
-#include "../../EAPBase/include/Session.h"
+#include "Config.h"
+#include "Credentials.h"
+
+#include "../../TLS/include/Method.h"
+#include "../../EAPBase/include/Method.h"
 
 
 namespace eap
diff --git a/lib/TTLS/include/Module.h b/lib/TTLS/include/Module.h
index d628deb..d9c57a6 100644
--- a/lib/TTLS/include/Module.h
+++ b/lib/TTLS/include/Module.h
@@ -30,7 +30,7 @@ namespace eap
 
 #include "Config.h"
 #include "Credentials.h"
-#include "Session.h"
+#include "Method.h"
 
 
 namespace eap
diff --git a/lib/TTLS/src/Session.cpp b/lib/TTLS/src/Method.cpp
similarity index 100%
rename from lib/TTLS/src/Session.cpp
rename to lib/TTLS/src/Method.cpp
diff --git a/lib/TTLS/src/StdAfx.h b/lib/TTLS/src/StdAfx.h
index 012310e..25fe406 100644
--- a/lib/TTLS/src/StdAfx.h
+++ b/lib/TTLS/src/StdAfx.h
@@ -22,8 +22,8 @@
 
 #include "../include/Config.h"
 #include "../include/Credentials.h"
+#include "../include/Method.h"
 #include "../include/Module.h"
-#include "../include/Session.h"
 
 #include "../../EAPBase/include/EAPXML.h"