diff --git a/EAPMethods/MSIBuild/Makefile b/EAPMethods/MSIBuild/Makefile
index dd01abd..91dca24 100644
Binary files a/EAPMethods/MSIBuild/Makefile and b/EAPMethods/MSIBuild/Makefile differ
diff --git a/EAPMethods/build/EAPMethodUI.def b/EAPMethods/build/EAPMethod_UI.def
similarity index 100%
rename from EAPMethods/build/EAPMethodUI.def
rename to EAPMethods/build/EAPMethod_UI.def
diff --git a/EAPMethods/build/EAPMethodUI.props b/EAPMethods/build/EAPMethod_UI.props
similarity index 75%
rename from EAPMethods/build/EAPMethodUI.props
rename to EAPMethods/build/EAPMethod_UI.props
index 03620bd..afbdc91 100644
--- a/EAPMethods/build/EAPMethodUI.props
+++ b/EAPMethods/build/EAPMethod_UI.props
@@ -7,10 +7,10 @@
- StdAfxUI.h
+ StdAfx_UI.h
- EAPMethodUI.def
+ EAPMethod_UI.def
diff --git a/EAPMethods/build/EAPTTLSUI.vcxproj b/EAPMethods/build/EAPTTLS_UI.vcxproj
similarity index 94%
rename from EAPMethods/build/EAPTTLSUI.vcxproj
rename to EAPMethods/build/EAPTTLS_UI.vcxproj
index 2a835d1..8580ba0 100644
--- a/EAPMethods/build/EAPTTLSUI.vcxproj
+++ b/EAPMethods/build/EAPTTLS_UI.vcxproj
@@ -28,7 +28,7 @@
{DD7A97CA-F18E-43B7-95C4-D06E6A291624}
- EAPTTLSUI
+ EAPTTLS_UI10.0
@@ -78,7 +78,7 @@
-
+
@@ -100,16 +100,16 @@
-
+
-
-
+
+ Create
-
+
@@ -165,7 +165,7 @@
-
+
diff --git a/EAPMethods/build/EAPTTLSUI.vcxproj.filters b/EAPMethods/build/EAPTTLS_UI.vcxproj.filters
similarity index 93%
rename from EAPMethods/build/EAPTTLSUI.vcxproj.filters
rename to EAPMethods/build/EAPTTLS_UI.vcxproj.filters
index e3fb9d7..b02d8d3 100644
--- a/EAPMethods/build/EAPTTLSUI.vcxproj.filters
+++ b/EAPMethods/build/EAPTTLS_UI.vcxproj.filters
@@ -19,25 +19,25 @@
-
+ Header Files
-
+ Source Files
-
+ Source Files
-
+ Resource Files
-
+ Source Files
diff --git a/EAPMethods/res/EAPTTLSUI.rc b/EAPMethods/res/EAPTTLS_UI.rc
similarity index 99%
rename from EAPMethods/res/EAPTTLSUI.rc
rename to EAPMethods/res/EAPTTLS_UI.rc
index 7f22d05..c1bee20 100644
Binary files a/EAPMethods/res/EAPTTLSUI.rc and b/EAPMethods/res/EAPTTLS_UI.rc differ
diff --git a/EAPMethods/src/MainUI.cpp b/EAPMethods/src/Main_UI.cpp
similarity index 97%
rename from EAPMethods/src/MainUI.cpp
rename to EAPMethods/src/Main_UI.cpp
index c1b52cd..dc22130 100644
--- a/EAPMethods/src/MainUI.cpp
+++ b/EAPMethods/src/Main_UI.cpp
@@ -18,7 +18,7 @@
along with GÉANTLink. If not, see .
*/
-#include "StdAfxUI.h"
+#include "StdAfx_UI.h"
#pragma comment(lib, "msxml6.lib")
diff --git a/EAPMethods/src/StdAfxUI.cpp b/EAPMethods/src/StdAfx_UI.cpp
similarity index 94%
rename from EAPMethods/src/StdAfxUI.cpp
rename to EAPMethods/src/StdAfx_UI.cpp
index 5a1ef45..be1cad5 100644
--- a/EAPMethods/src/StdAfxUI.cpp
+++ b/EAPMethods/src/StdAfx_UI.cpp
@@ -1,21 +1,21 @@
-/*
- Copyright 2015-2020 Amebis
- Copyright 2016 GÉANT
-
- This file is part of GÉANTLink.
-
- GÉANTLink is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- GÉANTLink is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GÉANTLink. If not, see .
-*/
-
-#include "StdAfxUI.h"
+/*
+ Copyright 2015-2020 Amebis
+ Copyright 2016 GÉANT
+
+ This file is part of GÉANTLink.
+
+ GÉANTLink is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ GÉANTLink is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GÉANTLink. If not, see .
+*/
+
+#include "StdAfx_UI.h"
diff --git a/EAPMethods/src/StdAfxUI.h b/EAPMethods/src/StdAfx_UI.h
similarity index 100%
rename from EAPMethods/src/StdAfxUI.h
rename to EAPMethods/src/StdAfx_UI.h
diff --git a/GEANTLink.sln b/GEANTLink.sln
index ec6a4bb..e30cfed 100644
--- a/GEANTLink.sln
+++ b/GEANTLink.sln
@@ -23,7 +23,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CredWrite", "CredWrite\Cred
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Events", "lib\Events\build\Events.vcxproj", "{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLSUI", "EAPMethods\build\EAPTTLSUI.vcxproj", "{DD7A97CA-F18E-43B7-95C4-D06E6A291624}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLS_UI", "EAPMethods\build\EAPTTLS_UI.vcxproj", "{DD7A97CA-F18E-43B7-95C4-D06E6A291624}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPBase", "lib\EAPBase\build\EAPBase.vcxproj", "{AD6816A0-9600-4E01-8C49-39D03D1E791F}"
EndProject
diff --git a/MakefileEAPMethod.mak b/MakefileEAPMethod.mak
index a56f4a9..aac57c7 100644
Binary files a/MakefileEAPMethod.mak and b/MakefileEAPMethod.mak differ
diff --git a/MakefilePlatCfg.mak b/MakefilePlatCfg.mak
index 144ef33..9c7d02f 100644
Binary files a/MakefilePlatCfg.mak and b/MakefilePlatCfg.mak differ
diff --git a/README.md b/README.md
index 2e2f952..5e60d9c 100644
--- a/README.md
+++ b/README.md
@@ -123,7 +123,7 @@ Before one can attempt to debug EAP DLLs, you should run `nmake register` from a
Next, one must configure a network profile to actually use one of this product's EAP modules for the authentication.
-EAP modules are divided into two DLLs: backend (i.e. _EAPTTLS.dll_) and GUI (i.e. _EAPTTLSUI.dll_).
+EAP modules are divided into two DLLs: backend (i.e. _EAPTTLS.dll_) and GUI (i.e. _EAPTTLS_UI.dll_).
##### Backend DLL
diff --git a/lib/TTLS_UI/src/Module.cpp b/lib/TTLS_UI/src/Module.cpp
index 3f9e962..6f00d8f 100644
--- a/lib/TTLS_UI/src/Module.cpp
+++ b/lib/TTLS_UI/src/Module.cpp
@@ -524,7 +524,7 @@ wxInitializerPeer::wxInitializerPeer(_In_ HINSTANCE instance, _In_opt_ HWND hwnd
s_locale = new wxLocale;
if (wxInitializeLocale(*s_locale)) {
s_locale->AddCatalog(wxT("wxExtend") wxT(wxExtendVersion));
- s_locale->AddCatalog(wxT("EAPTTLSUI"));
+ s_locale->AddCatalog(wxT("EAPTTLS_UI"));
}
}
diff --git a/output/locale/.gitignore b/output/locale/.gitignore
index a9f0038..c98c6af 100644
--- a/output/locale/.gitignore
+++ b/output/locale/.gitignore
@@ -1,4 +1,4 @@
-*/EAPTTLSUI.mo
+*/EAPTTLS_UI.mo
*/EventMonitor.mo
*/wxExtend*.mo
*/wxstd.mo