diff --git a/lib/EAPBase_UI/include/EAP_UI.h b/lib/EAPBase_UI/include/EAP_UI.h
index a157585..1379115 100644
--- a/lib/EAPBase_UI/include/EAP_UI.h
+++ b/lib/EAPBase_UI/include/EAP_UI.h
@@ -25,37 +25,37 @@
 
 
 ///
-/// EAP configuration dialog
+/// EAP top-most configuration dialog
 ///
 template <class _Tmeth, class _wxT> class wxEAPConfigDialog;
 
 ///
-/// EAP credentials dialog
+/// EAP top-most credential dialog
 ///
 template <class _Tprov> class wxEAPCredentialsDialog;
 
 ///
-/// EAP dialog banner
+/// Reusable EAP dialog banner for `wxEAPConfigDialog` and `wxEAPCredentialsDialog`
 ///
 class wxEAPBannerPanel;
 
 ///
 /// EAP Provider-locked congifuration note
 ///
-template <class _Tprov> class wxEAPProviderLocked;
+template <class _Tprov> class wxEAPProviderLockedPanel;
 
 ///
-/// Base template for credentials configuration panel
+/// Base template for credential configuration panel
 ///
 template <class _Tprov, class _Tmeth, class _wxT> class wxEAPCredentialsConfigPanel;
 
 ///
-/// Base template for all credential panels
+/// Base template for all credential entry panels
 ///
-template <class _Tcred, class _Tbase> class wxCredentialsPanel;
+template <class _Tcred, class _Tbase> class wxEAPCredentialsPanelBase;
 
 ///
-/// Password credentials panel
+/// Generic password credential entry panel
 ///
 template <class _Tprov> class wxPasswordCredentialsPanel;
 
@@ -218,15 +218,15 @@ protected:
 
 
 template <class _Tprov>
-class wxEAPProviderLocked : public wxEAPProviderLockedBase
+class wxEAPProviderLockedPanel : public wxEAPProviderLockedPanelBase
 {
 public:
     ///
     /// Constructs a notice pannel and set the title text
     ///
-    wxEAPProviderLocked(_Tprov &prov, wxWindow* parent) :
+    wxEAPProviderLockedPanel(_Tprov &prov, wxWindow* parent) :
         m_prov(prov),
-        wxEAPProviderLockedBase(parent)
+        wxEAPProviderLockedPanelBase(parent)
     {
         // Load and set icon.
         if (m_shell32.load(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
@@ -496,7 +496,7 @@ private:
 
 
 template <class _Tcred, class _Tbase>
-class wxCredentialsPanel : public _Tbase
+class wxEAPCredentialsPanelBase : public _Tbase
 {
 public:
     ///
@@ -507,7 +507,7 @@ public:
     /// \param[in]    parent         Parent window
     /// \param[in]    is_config      Is this panel used to pre-enter credentials? When \c true, the "Remember" checkbox is always selected and disabled.
     ///
-    wxCredentialsPanel(_Tcred &cred, LPCTSTR pszCredTarget, wxWindow* parent, bool is_config = false) :
+    wxEAPCredentialsPanelBase(_Tcred &cred, LPCTSTR pszCredTarget, wxWindow* parent, bool is_config = false) :
         m_cred(cred),
         m_target(pszCredTarget),
         _Tbase(parent)
@@ -572,7 +572,7 @@ protected:
 
 
 template <class _Tprov>
-class wxPasswordCredentialsPanel : public wxCredentialsPanel<eap::credentials_pass, wxPasswordCredentialsPanelBase>
+class wxPasswordCredentialsPanel : public wxEAPCredentialsPanelBase<eap::credentials_pass, wxEAPCredentialsPanelPassBase>
 {
 public:
     ///
@@ -585,7 +585,7 @@ public:
     /// \param[in]    is_config      Is this panel used to pre-enter credentials? When \c true, the "Remember" checkbox is always selected and disabled.
     ///
     wxPasswordCredentialsPanel(_Tprov &prov, eap::credentials_pass &cred, LPCTSTR pszCredTarget, wxWindow* parent, bool is_config = false) :
-        wxCredentialsPanel<eap::credentials_pass, wxPasswordCredentialsPanelBase>(cred, pszCredTarget, parent, is_config)
+        wxEAPCredentialsPanelBase<eap::credentials_pass, wxEAPCredentialsPanelPassBase>(cred, pszCredTarget, parent, is_config)
     {
         // Load and set icon.
         if (m_shell32.load(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
diff --git a/lib/EAPBase_UI/res/wxEAP_UI.cpp b/lib/EAPBase_UI/res/wxEAP_UI.cpp
index 44513f0..74b359d 100644
--- a/lib/EAPBase_UI/res/wxEAP_UI.cpp
+++ b/lib/EAPBase_UI/res/wxEAP_UI.cpp
@@ -119,7 +119,7 @@ wxEAPBannerPanelBase::~wxEAPBannerPanelBase()
 {
 }
 
-wxEAPProviderLockedBase::wxEAPProviderLockedBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
+wxEAPProviderLockedPanelBase::wxEAPProviderLockedPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
 	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_INFOBK ) );
 	
@@ -143,7 +143,7 @@ wxEAPProviderLockedBase::wxEAPProviderLockedBase( wxWindow* parent, wxWindowID i
 	this->Layout();
 }
 
-wxEAPProviderLockedBase::~wxEAPProviderLockedBase()
+wxEAPProviderLockedPanelBase::~wxEAPProviderLockedPanelBase()
 {
 }
 
@@ -269,7 +269,7 @@ wxEAPCredentialsConfigPanelBase::~wxEAPCredentialsConfigPanelBase()
 	
 }
 
-wxPasswordCredentialsPanelBase::wxPasswordCredentialsPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
+wxEAPCredentialsPanelPassBase::wxEAPCredentialsPanelPassBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
 	wxStaticBoxSizer* sb_credentials;
 	sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Client Credentials") ), wxVERTICAL );
@@ -330,6 +330,6 @@ wxPasswordCredentialsPanelBase::wxPasswordCredentialsPanelBase( wxWindow* parent
 	this->Layout();
 }
 
-wxPasswordCredentialsPanelBase::~wxPasswordCredentialsPanelBase()
+wxEAPCredentialsPanelPassBase::~wxEAPCredentialsPanelPassBase()
 {
 }
diff --git a/lib/EAPBase_UI/res/wxEAP_UI.fbp b/lib/EAPBase_UI/res/wxEAP_UI.fbp
index 8709d28..2208544 100644
--- a/lib/EAPBase_UI/res/wxEAP_UI.fbp
+++ b/lib/EAPBase_UI/res/wxEAP_UI.fbp
@@ -637,7 +637,7 @@
             <property name="id">wxID_ANY</property>
             <property name="maximum_size"></property>
             <property name="minimum_size"></property>
-            <property name="name">wxEAPProviderLockedBase</property>
+            <property name="name">wxEAPProviderLockedPanelBase</property>
             <property name="pos"></property>
             <property name="size">500,-1</property>
             <property name="subclass"></property>
@@ -1818,7 +1818,7 @@
             <property name="id">wxID_ANY</property>
             <property name="maximum_size"></property>
             <property name="minimum_size"></property>
-            <property name="name">wxPasswordCredentialsPanelBase</property>
+            <property name="name">wxEAPCredentialsPanelPassBase</property>
             <property name="pos"></property>
             <property name="size">500,-1</property>
             <property name="subclass"></property>
diff --git a/lib/EAPBase_UI/res/wxEAP_UI.h b/lib/EAPBase_UI/res/wxEAP_UI.h
index 29889c7..5a03674 100644
--- a/lib/EAPBase_UI/res/wxEAP_UI.h
+++ b/lib/EAPBase_UI/res/wxEAP_UI.h
@@ -102,9 +102,9 @@ class wxEAPBannerPanelBase : public wxPanel
 };
 
 ///////////////////////////////////////////////////////////////////////////////
-/// Class wxEAPProviderLockedBase
+/// Class wxEAPProviderLockedPanelBase
 ///////////////////////////////////////////////////////////////////////////////
-class wxEAPProviderLockedBase : public wxPanel 
+class wxEAPProviderLockedPanelBase : public wxPanel 
 {
 	private:
 	
@@ -115,8 +115,8 @@ class wxEAPProviderLockedBase : public wxPanel
 	
 	public:
 		
-		wxEAPProviderLockedBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxSIMPLE_BORDER|wxTAB_TRAVERSAL ); 
-		~wxEAPProviderLockedBase();
+		wxEAPProviderLockedPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxSIMPLE_BORDER|wxTAB_TRAVERSAL ); 
+		~wxEAPProviderLockedPanelBase();
 	
 };
 
@@ -153,9 +153,9 @@ class wxEAPCredentialsConfigPanelBase : public wxPanel
 };
 
 ///////////////////////////////////////////////////////////////////////////////
-/// Class wxPasswordCredentialsPanelBase
+/// Class wxEAPCredentialsPanelPassBase
 ///////////////////////////////////////////////////////////////////////////////
-class wxPasswordCredentialsPanelBase : public wxPanel 
+class wxEAPCredentialsPanelPassBase : public wxPanel 
 {
 	private:
 	
@@ -170,8 +170,8 @@ class wxPasswordCredentialsPanelBase : public wxPanel
 	
 	public:
 		
-		wxPasswordCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); 
-		~wxPasswordCredentialsPanelBase();
+		wxEAPCredentialsPanelPassBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); 
+		~wxEAPCredentialsPanelPassBase();
 	
 };
 
diff --git a/lib/PAP_UI/include/PAP_UI.h b/lib/PAP_UI/include/PAP_UI.h
index acf4029..f1dc488 100644
--- a/lib/PAP_UI/include/PAP_UI.h
+++ b/lib/PAP_UI/include/PAP_UI.h
@@ -23,7 +23,7 @@
 #include "../../PAP/include/Credentials.h"
 
 ///
-/// PAP credentials configuration panel
+/// PAP credential configuration panel
 ///
 template <class _Tprov> class wxPAPCredentialsConfigPanel;
 
diff --git a/lib/TLS_UI/include/TLS_UI.h b/lib/TLS_UI/include/TLS_UI.h
index c72279e..7abf95b 100644
--- a/lib/TLS_UI/include/TLS_UI.h
+++ b/lib/TLS_UI/include/TLS_UI.h
@@ -56,24 +56,24 @@ class wxFQDNValidator;
 class wxFQDNListValidator;
 
 ///
-/// EAPTLS credential panel
+/// TLS credential panel
 ///
-template <class _Tprov> class wxEAPTLSCredentialsPanel;
+template <class _Tprov> class wxTLSCredentialsPanel;
 
 ///
-/// EAPTLS server trust configuration panel
+/// TLS server trust configuration panel
 ///
-template <class _Tprov> class wxEAPTLSServerTrustPanel;
+template <class _Tprov> class wxTLSServerTrustPanel;
 
 ///
 /// TLS credentials configuration panel
 ///
-template <class _Tprov> class wxEAPTLSCredentialsConfigPanel;
+template <class _Tprov> class wxTLSCredentialsConfigPanel;
 
 ///
-/// EAPTLS configuration panel
+/// TLS configuration panel
 ///
-template <class _Tprov> class wxEAPTLSConfigPanel;
+template <class _Tprov> class wxTLSConfigPanel;
 
 #pragma once
 
@@ -249,14 +249,14 @@ protected:
 
 
 template <class _Tprov>
-class wxEAPTLSCredentialsPanel : public wxCredentialsPanel<eap::credentials_tls, wxEAPTLSCredentialsPanelBase>
+class wxTLSCredentialsPanel : public wxEAPCredentialsPanelBase<eap::credentials_tls, wxTLSCredentialsPanelBase>
 {
 public:
     ///
     /// Constructs a configuration panel
     ///
-    wxEAPTLSCredentialsPanel(_Tprov &prov, eap::credentials_tls &cred, LPCTSTR pszCredTarget, wxWindow* parent, bool is_config = false) :
-        wxCredentialsPanel<eap::credentials_tls, wxEAPTLSCredentialsPanelBase>(cred, pszCredTarget, parent, is_config)
+    wxTLSCredentialsPanel(_Tprov &prov, eap::credentials_tls &cred, LPCTSTR pszCredTarget, wxWindow* parent, bool is_config = false) :
+        wxEAPCredentialsPanelBase<eap::credentials_tls, wxTLSCredentialsPanelBase>(cred, pszCredTarget, parent, is_config)
     {
         UNREFERENCED_PARAMETER(prov);
 
@@ -345,13 +345,13 @@ protected:
 
 
 template <class _Tprov>
-class wxEAPTLSServerTrustPanel : public wxEAPTLSServerTrustConfigPanelBase
+class wxTLSServerTrustPanel : public wxEAPTLSServerTrustConfigPanelBase
 {
 public:
     ///
     /// Constructs a configuration panel
     ///
-    wxEAPTLSServerTrustPanel(_Tprov &prov, eap::config_method_tls &cfg, wxWindow* parent) :
+    wxTLSServerTrustPanel(_Tprov &prov, eap::config_method_tls &cfg, wxWindow* parent) :
         m_prov(prov),
         m_cfg(cfg),
         wxEAPTLSServerTrustConfigPanelBase(parent)
@@ -528,7 +528,7 @@ protected:
 
 
 template <class _Tprov>
-class wxEAPTLSCredentialsConfigPanel : public wxEAPCredentialsConfigPanel<_Tprov, eap::config_method_tls, wxEAPTLSCredentialsPanel<_Tprov> >
+class wxTLSCredentialsConfigPanel : public wxEAPCredentialsConfigPanel<_Tprov, eap::config_method_tls, wxTLSCredentialsPanel<_Tprov> >
 {
 public:
     ///
@@ -539,46 +539,46 @@ public:
     /// \param[in]    pszCredTarget  Target name of credentials in Windows Credential Manager. Can be further decorated to create final target name.
     /// \param[in]    parent         Parent window
     ///
-    wxEAPTLSCredentialsConfigPanel(_Tprov &prov, eap::config_method_tls &cfg, LPCTSTR pszCredTarget, wxWindow *parent) :
-        wxEAPCredentialsConfigPanel<_Tprov, eap::config_method_tls, wxEAPTLSCredentialsPanel<_Tprov> >(prov, cfg, pszCredTarget, parent)
+    wxTLSCredentialsConfigPanel(_Tprov &prov, eap::config_method_tls &cfg, LPCTSTR pszCredTarget, wxWindow *parent) :
+        wxEAPCredentialsConfigPanel<_Tprov, eap::config_method_tls, wxTLSCredentialsPanel<_Tprov> >(prov, cfg, pszCredTarget, parent)
     {
     }
 };
 
 
 template <class _Tprov>
-class wxEAPTLSConfigPanel : public wxPanel
+class wxTLSConfigPanel : public wxPanel
 {
 public:
     ///
     /// Constructs a configuration panel
     ///
-    wxEAPTLSConfigPanel(_Tprov &prov, eap::config_method_tls &cfg, LPCTSTR pszCredTarget, wxWindow* parent) : wxPanel(parent)
+    wxTLSConfigPanel(_Tprov &prov, eap::config_method_tls &cfg, LPCTSTR pszCredTarget, wxWindow* parent) : wxPanel(parent)
     {
         wxBoxSizer* sb_content;
         sb_content = new wxBoxSizer( wxVERTICAL );
 
-        m_server_trust = new wxEAPTLSServerTrustPanel<_Tprov>(prov, cfg, this);
+        m_server_trust = new wxTLSServerTrustPanel<_Tprov>(prov, cfg, this);
         sb_content->Add(m_server_trust, 0, wxDOWN|wxEXPAND, 5);
 
-        m_credentials = new wxEAPTLSCredentialsConfigPanel<_Tprov>(prov, cfg, pszCredTarget, this);
+        m_credentials = new wxTLSCredentialsConfigPanel<_Tprov>(prov, cfg, pszCredTarget, this);
         sb_content->Add(m_credentials, 0, wxUP|wxEXPAND, 5);
 
         this->SetSizer(sb_content);
         this->Layout();
 
         // Connect Events
-        this->Connect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(wxEAPTLSConfigPanel::OnInitDialog));
+        this->Connect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(wxTLSConfigPanel::OnInitDialog));
     }
 
 
     ///
     /// Destructs the configuration panel
     ///
-    virtual ~wxEAPTLSConfigPanel()
+    virtual ~wxTLSConfigPanel()
     {
         // Disconnect Events
-        this->Disconnect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(wxEAPTLSConfigPanel::OnInitDialog));
+        this->Disconnect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(wxTLSConfigPanel::OnInitDialog));
     }
 
 protected:
@@ -595,6 +595,6 @@ protected:
     /// \endcond
 
 protected:
-    wxEAPTLSServerTrustPanel<_Tprov> *m_server_trust;       ///< Server trust configuration panel
-    wxEAPTLSCredentialsConfigPanel<_Tprov> *m_credentials;  ///< Credentials configuration panel
+    wxTLSServerTrustPanel<_Tprov> *m_server_trust;       ///< Server trust configuration panel
+    wxTLSCredentialsConfigPanel<_Tprov> *m_credentials;  ///< Credentials configuration panel
 };
diff --git a/lib/TLS_UI/res/wxTLS_UI.cpp b/lib/TLS_UI/res/wxTLS_UI.cpp
index 756f072..66ea0d4 100644
--- a/lib/TLS_UI/res/wxTLS_UI.cpp
+++ b/lib/TLS_UI/res/wxTLS_UI.cpp
@@ -114,7 +114,7 @@ wxEAPTLSServerTrustConfigPanelBase::~wxEAPTLSServerTrustConfigPanelBase()
 	
 }
 
-wxEAPTLSCredentialsPanelBase::wxEAPTLSCredentialsPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
+wxTLSCredentialsPanelBase::wxTLSCredentialsPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
 	wxStaticBoxSizer* sb_credentials;
 	sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("TLS Client Certificate") ), wxVERTICAL );
@@ -177,12 +177,12 @@ wxEAPTLSCredentialsPanelBase::wxEAPTLSCredentialsPanelBase( wxWindow* parent, wx
 	this->Layout();
 	
 	// Connect Events
-	m_cert_select->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( wxEAPTLSCredentialsPanelBase::OnCertSelect ), NULL, this );
+	m_cert_select->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( wxTLSCredentialsPanelBase::OnCertSelect ), NULL, this );
 }
 
-wxEAPTLSCredentialsPanelBase::~wxEAPTLSCredentialsPanelBase()
+wxTLSCredentialsPanelBase::~wxTLSCredentialsPanelBase()
 {
 	// Disconnect Events
-	m_cert_select->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( wxEAPTLSCredentialsPanelBase::OnCertSelect ), NULL, this );
+	m_cert_select->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( wxTLSCredentialsPanelBase::OnCertSelect ), NULL, this );
 	
 }
diff --git a/lib/TLS_UI/res/wxTLS_UI.fbp b/lib/TLS_UI/res/wxTLS_UI.fbp
index 5b886bf..7cfe90d 100644
--- a/lib/TLS_UI/res/wxTLS_UI.fbp
+++ b/lib/TLS_UI/res/wxTLS_UI.fbp
@@ -1013,7 +1013,7 @@
             <property name="id">wxID_ANY</property>
             <property name="maximum_size"></property>
             <property name="minimum_size"></property>
-            <property name="name">wxEAPTLSCredentialsPanelBase</property>
+            <property name="name">wxTLSCredentialsPanelBase</property>
             <property name="pos"></property>
             <property name="size">500,-1</property>
             <property name="subclass"></property>
diff --git a/lib/TLS_UI/res/wxTLS_UI.h b/lib/TLS_UI/res/wxTLS_UI.h
index c83fa76..6b05d42 100644
--- a/lib/TLS_UI/res/wxTLS_UI.h
+++ b/lib/TLS_UI/res/wxTLS_UI.h
@@ -68,9 +68,9 @@ class wxEAPTLSServerTrustConfigPanelBase : public wxPanel
 };
 
 ///////////////////////////////////////////////////////////////////////////////
-/// Class wxEAPTLSCredentialsPanelBase
+/// Class wxTLSCredentialsPanelBase
 ///////////////////////////////////////////////////////////////////////////////
-class wxEAPTLSCredentialsPanelBase : public wxPanel 
+class wxTLSCredentialsPanelBase : public wxPanel 
 {
 	private:
 	
@@ -88,8 +88,8 @@ class wxEAPTLSCredentialsPanelBase : public wxPanel
 	
 	public:
 		
-		wxEAPTLSCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); 
-		~wxEAPTLSCredentialsPanelBase();
+		wxTLSCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); 
+		~wxTLSCredentialsPanelBase();
 	
 };
 
diff --git a/lib/TTLS_UI/include/TTLS_UI.h b/lib/TTLS_UI/include/TTLS_UI.h
index f767997..86761bf 100644
--- a/lib/TTLS_UI/include/TTLS_UI.h
+++ b/lib/TTLS_UI/include/TTLS_UI.h
@@ -19,14 +19,14 @@
 */
 
 ///
-/// EAPTTLS configuration panel
+/// TTLS configuration panel
 ///
-template <class _Tprov> class wxEAPTTLSConfigPanel;
+template <class _Tprov> class wxTTLSConfigPanel;
 
 ///
-/// EAPTTLS configuration
+/// TTLS configuration scrollable window
 ///
-template <class _Tprov> class wxEAPTTLSConfig;
+template <class _Tprov> class wxTTLSConfigWindow;
 
 #pragma once
 
@@ -47,16 +47,16 @@ template <class _Tprov> class wxEAPTTLSConfig;
 
 
 template <class _Tprov>
-class wxEAPTTLSConfigPanel : public wxEAPTTLSConfigPanelBase
+class wxTTLSConfigPanel : public wxTTLSConfigPanelBase
 {
 public:
     ///
     /// Constructs a configuration panel
     ///
-    wxEAPTTLSConfigPanel(_Tprov &prov, eap::config_method_ttls &cfg, wxWindow* parent) :
+    wxTTLSConfigPanel(_Tprov &prov, eap::config_method_ttls &cfg, wxWindow* parent) :
         m_prov(prov),
         m_cfg(cfg),
-        wxEAPTTLSConfigPanelBase(parent)
+        wxTTLSConfigPanelBase(parent)
     {
         // Load and set icon.
         if (m_shell32.load(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
@@ -86,13 +86,13 @@ protected:
             m_outer_identity_custom_val->SetValue(m_cfg.m_anonymous_identity);
         }
 
-        return wxEAPTTLSConfigPanelBase::TransferDataToWindow();
+        return wxTTLSConfigPanelBase::TransferDataToWindow();
     }
 
 
     virtual bool TransferDataFromWindow()
     {
-        wxCHECK(wxEAPTTLSConfigPanelBase::TransferDataFromWindow(), false);
+        wxCHECK(wxTTLSConfigPanelBase::TransferDataFromWindow(), false);
 
         if (!m_prov.m_read_only) {
             // This is not a provider-locked configuration. Save the data.
@@ -129,7 +129,7 @@ protected:
 
 
 template <class _Tprov>
-class wxEAPTTLSConfig : public wxScrolledWindow
+class wxTTLSConfigWindow : public wxScrolledWindow
 {
 public:
     ///
@@ -139,7 +139,7 @@ public:
     /// \param[in]    pszCredTarget  Target name of credentials in Windows Credential Manager. Can be further decorated to create final target name.
     /// \param[in]    parent         Parent window
     ///
-    wxEAPTTLSConfig(_Tprov &prov, eap::config_method_ttls &cfg, LPCTSTR pszCredTarget, wxWindow* parent) :
+    wxTTLSConfigWindow(_Tprov &prov, eap::config_method_ttls &cfg, LPCTSTR pszCredTarget, wxWindow* parent) :
         m_prov(prov),
         m_cfg(cfg),
         m_cfg_pap(cfg.m_module),
@@ -149,7 +149,7 @@ public:
         sb_content = new wxBoxSizer( wxVERTICAL );
 
         if (prov.m_read_only)
-            sb_content->Add(new wxEAPProviderLocked<_Tprov>(prov, this), 0, wxALL|wxEXPAND, 5);
+            sb_content->Add(new wxEAPProviderLockedPanel<_Tprov>(prov, this), 0, wxALL|wxEXPAND, 5);
 
         m_inner_title = new wxStaticText(this, wxID_ANY, _("Inner Authentication"), wxDefaultPosition, wxDefaultSize, 0);
         m_inner_title->SetFont(wxFont(18, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString));
@@ -168,10 +168,10 @@ public:
         m_outer_title->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_INACTIVECAPTION ) );
         sb_content->Add(m_outer_title, 0, wxALL|wxALIGN_RIGHT, 5);
 
-        m_outer_identity = new wxEAPTTLSConfigPanel<_Tprov>(prov, m_cfg, this);
+        m_outer_identity = new wxTTLSConfigPanel<_Tprov>(prov, m_cfg, this);
         sb_content->Add(m_outer_identity, 0, wxALL|wxEXPAND, 5);
 
-        m_tls = new wxEAPTLSConfigPanel<_Tprov>(prov, m_cfg, pszCredTarget, this);
+        m_tls = new wxTLSConfigPanel<_Tprov>(prov, m_cfg, pszCredTarget, this);
         sb_content->Add(m_tls, 0, wxALL|wxEXPAND, 5);
 
         wxSize size = sb_content->CalcMin();
@@ -189,17 +189,17 @@ public:
         m_inner_type->SetFocusFromKbd();
 
         // Connect Events
-        this->Connect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(wxEAPTTLSConfig::OnInitDialog));
+        this->Connect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(wxTTLSConfigWindow::OnInitDialog));
     }
 
 
     ///
     /// Destructs the configuration panel
     ///
-    virtual ~wxEAPTTLSConfig()
+    virtual ~wxTTLSConfigWindow()
     {
         // Disconnect Events
-        this->Disconnect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(wxEAPTTLSConfig::OnInitDialog));
+        this->Disconnect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(wxTTLSConfigWindow::OnInitDialog));
     }
 
 
@@ -221,7 +221,7 @@ protected:
             wxFAIL_MSG(wxT("Unsupported inner authentication method type."));
 
         // Do not invoke inherited TransferDataToWindow(), as it will call others TransferDataToWindow().
-        // This will handle wxEAPTTLSConfig::OnInitDialog() via wxEVT_INIT_DIALOG forwarding.
+        // This will handle wxTTLSConfigWindow::OnInitDialog() via wxEVT_INIT_DIALOG forwarding.
         return true /*wxScrolledWindow::TransferDataToWindow()*/;
     }
 
@@ -265,8 +265,8 @@ protected:
     _Tprov &m_prov;                                 ///< EAP provider
     eap::config_method_ttls &m_cfg;                        ///< TTLS configuration
     wxStaticText *m_outer_title;                    ///< Outer authentication title
-    wxEAPTTLSConfigPanel<_Tprov> *m_outer_identity; ///< Outer identity configuration panel
-    wxEAPTLSConfigPanel<_Tprov> *m_tls;             ///< TLS configuration panel
+    wxTTLSConfigPanel<_Tprov> *m_outer_identity; ///< Outer identity configuration panel
+    wxTLSConfigPanel<_Tprov> *m_tls;             ///< TLS configuration panel
     wxStaticText *m_inner_title;                    ///< Inner authentication title
     wxChoicebook *m_inner_type;                     ///< Inner authentication type
 
diff --git a/lib/TTLS_UI/res/wxTTLS_UI.cpp b/lib/TTLS_UI/res/wxTTLS_UI.cpp
index 2740691..ae31087 100644
--- a/lib/TTLS_UI/res/wxTTLS_UI.cpp
+++ b/lib/TTLS_UI/res/wxTTLS_UI.cpp
@@ -11,7 +11,7 @@
 
 ///////////////////////////////////////////////////////////////////////////
 
-wxEAPTTLSConfigPanelBase::wxEAPTTLSConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
+wxTTLSConfigPanelBase::wxTTLSConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
 	wxStaticBoxSizer* sb_outer_identity;
 	sb_outer_identity = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Outer Identity") ), wxVERTICAL );
@@ -72,12 +72,12 @@ wxEAPTTLSConfigPanelBase::wxEAPTTLSConfigPanelBase( wxWindow* parent, wxWindowID
 	this->Layout();
 	
 	// Connect Events
-	this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEAPTTLSConfigPanelBase::OnUpdateUI ) );
+	this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxTTLSConfigPanelBase::OnUpdateUI ) );
 }
 
-wxEAPTTLSConfigPanelBase::~wxEAPTTLSConfigPanelBase()
+wxTTLSConfigPanelBase::~wxTTLSConfigPanelBase()
 {
 	// Disconnect Events
-	this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEAPTTLSConfigPanelBase::OnUpdateUI ) );
+	this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxTTLSConfigPanelBase::OnUpdateUI ) );
 	
 }
diff --git a/lib/TTLS_UI/res/wxTTLS_UI.fbp b/lib/TTLS_UI/res/wxTTLS_UI.fbp
index ffbe92d..dc480e7 100644
--- a/lib/TTLS_UI/res/wxTTLS_UI.fbp
+++ b/lib/TTLS_UI/res/wxTTLS_UI.fbp
@@ -40,7 +40,7 @@
             <property name="id">wxID_ANY</property>
             <property name="maximum_size"></property>
             <property name="minimum_size"></property>
-            <property name="name">wxEAPTTLSConfigPanelBase</property>
+            <property name="name">wxTTLSConfigPanelBase</property>
             <property name="pos"></property>
             <property name="size">500,-1</property>
             <property name="subclass"></property>
diff --git a/lib/TTLS_UI/res/wxTTLS_UI.h b/lib/TTLS_UI/res/wxTTLS_UI.h
index 27d8bd3..d6dd7bf 100644
--- a/lib/TTLS_UI/res/wxTTLS_UI.h
+++ b/lib/TTLS_UI/res/wxTTLS_UI.h
@@ -30,9 +30,9 @@
 ///////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
-/// Class wxEAPTTLSConfigPanelBase
+/// Class wxTTLSConfigPanelBase
 ///////////////////////////////////////////////////////////////////////////////
-class wxEAPTTLSConfigPanelBase : public wxPanel 
+class wxTTLSConfigPanelBase : public wxPanel 
 {
 	private:
 	
@@ -50,8 +50,8 @@ class wxEAPTTLSConfigPanelBase : public wxPanel
 	
 	public:
 		
-		wxEAPTTLSConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); 
-		~wxEAPTTLSConfigPanelBase();
+		wxTTLSConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); 
+		~wxTTLSConfigPanelBase();
 	
 };
 
diff --git a/lib/TTLS_UI/src/Module.cpp b/lib/TTLS_UI/src/Module.cpp
index f9b3a68..c544a67 100644
--- a/lib/TTLS_UI/src/Module.cpp
+++ b/lib/TTLS_UI/src/Module.cpp
@@ -50,7 +50,7 @@ bool eap::peer_ttls_ui::invoke_config_ui(
         wxTopLevelWindows.Append(&parent);
 
         // Create and launch configuration dialog.
-        wxEAPConfigDialog<config_method_ttls, wxEAPTTLSConfig<provider_config_type> > dlg(cfg, &parent);
+        wxEAPConfigDialog<config_method_ttls, wxTTLSConfigWindow<provider_config_type> > dlg(cfg, &parent);
         result = dlg.ShowModal();
 
         wxTopLevelWindows.DeleteObject(&parent);