diff --git a/EAPMethods/src/Main.cpp b/EAPMethods/src/Main.cpp
index 0d336ea..0fb6609 100644
--- a/EAPMethods/src/Main.cpp
+++ b/EAPMethods/src/Main.cpp
@@ -237,11 +237,11 @@ DWORD APIENTRY EapPeerGetIdentity(
         g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppwszIdentity is NULL.")));
     else {
         _EAPMETHOD_PEER::config_providers_type cfg(g_peer);
-        _EAPMETHOD_PEER::credentials_type usr(g_peer);
+        _EAPMETHOD_PEER::credentials_type cred(g_peer);
         if (!g_peer.unpack(cfg, pConnectionData, dwConnectionDataSize, ppEapError) ||
-            !g_peer.unpack(usr, pUserData, dwUserDataSize, ppEapError) ||
-            !g_peer.get_identity(dwFlags, cfg, usr, hTokenImpersonateUser, pfInvokeUI, ppwszIdentity, ppEapError) ||
-            !g_peer.pack(usr, ppUserDataOut, pdwUserDataOutSize, ppEapError))
+            !g_peer.unpack(cred, pUserData, dwUserDataSize, ppEapError) ||
+            !g_peer.get_identity(dwFlags, cfg, cred, hTokenImpersonateUser, pfInvokeUI, ppwszIdentity, ppEapError) ||
+            !g_peer.pack(cred, ppUserDataOut, pdwUserDataOutSize, ppEapError))
         {
             if (*ppEapError) {
                 g_peer.log_error(*ppEapError);
@@ -685,15 +685,15 @@ DWORD WINAPI EapPeerGetMethodProperties(
         g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pMethodPropertyArray is NULL.")));
     else {
         _EAPMETHOD_PEER::config_providers_type cfg(g_peer);
-        _EAPMETHOD_PEER::credentials_type usr(g_peer);
+        _EAPMETHOD_PEER::credentials_type cred(g_peer);
         if (!g_peer.unpack(cfg, pEapConnData, dwEapConnDataSize, ppEapError) ||
-            !g_peer.unpack(usr, pUserData, dwUserDataSize, ppEapError) ||
+            !g_peer.unpack(cred, pUserData, dwUserDataSize, ppEapError) ||
             !g_peer.get_method_properties(
                 dwVersion,
                 dwFlags,
                 hUserImpersonationToken,
                 cfg,
-                usr,
+                cred,
                 pMethodPropertyArray,
                 ppEapError))
         {
@@ -762,9 +762,9 @@ DWORD WINAPI EapPeerCredentialsXml2Blob(
 
         // Load credentials.
         pCredentialsDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eap-metadata=\"urn:ietf:params:xml:ns:yang:ietf-eap-metadata\""));
-        _EAPMETHOD_PEER::credentials_type usr(g_peer);
-        if (!usr.load(pXmlElCredentials, ppEapError) ||
-            !g_peer.pack(usr, ppCredentialsOut, pdwCredentialsOutSize, ppEapError))
+        _EAPMETHOD_PEER::credentials_type cred(g_peer);
+        if (!cred.load(pXmlElCredentials, ppEapError) ||
+            !g_peer.pack(cred, ppCredentialsOut, pdwCredentialsOutSize, ppEapError))
         {
             if (*ppEapError) {
                 g_peer.log_error(*ppEapError);
diff --git a/EAPMethods/src/Main_UI.cpp b/EAPMethods/src/Main_UI.cpp
index 3f8d15f..6f746d6 100644
--- a/EAPMethods/src/Main_UI.cpp
+++ b/EAPMethods/src/Main_UI.cpp
@@ -360,11 +360,11 @@ DWORD WINAPI EapPeerInvokeIdentityUI(
         g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppwszIdentity is NULL.")));
     else {
         _EAPMETHOD_PEER_UI::config_providers_type cfg(g_peer);
-        _EAPMETHOD_PEER_UI::credentials_type usr(g_peer);
+        _EAPMETHOD_PEER_UI::credentials_type cred(g_peer);
         if (!g_peer.unpack(cfg, pConnectionData, dwConnectionDataSize, ppEapError) ||
-            !g_peer.unpack(usr, pUserData, dwUserDataSize, ppEapError) ||
-            !g_peer.invoke_identity_ui(hwndParent, dwFlags, cfg, usr, ppwszIdentity, ppEapError) ||
-            !g_peer.pack(usr, ppUserDataOut, pdwUserDataOutSize, ppEapError))
+            !g_peer.unpack(cred, pUserData, dwUserDataSize, ppEapError) ||
+            !g_peer.invoke_identity_ui(hwndParent, dwFlags, cfg, cred, ppwszIdentity, ppEapError) ||
+            !g_peer.pack(cred, ppUserDataOut, pdwUserDataOutSize, ppEapError))
         {
             if (*ppEapError) {
                 g_peer.log_error(*ppEapError);
diff --git a/lib/EAPBase/include/Module.h b/lib/EAPBase/include/Module.h
index 2e90958..b3bfbb9 100644
--- a/lib/EAPBase/include/Module.h
+++ b/lib/EAPBase/include/Module.h
@@ -739,7 +739,7 @@ namespace eap
         virtual bool get_identity(
             _In_          DWORD                 dwFlags,
             _In_    const config_providers_type &cfg,
-            _Inout_       credentials_type      &usr,
+            _Inout_       credentials_type      &cred,
             _In_          HANDLE                hTokenImpersonateUser,
             _Out_         BOOL                  *pfInvokeUI,
             _Out_         WCHAR                 **ppwszIdentity,
@@ -759,7 +759,7 @@ namespace eap
             _In_        DWORD                     dwFlags,
             _In_        HANDLE                    hUserImpersonationToken,
             _In_  const config_providers_type     &cfg,
-            _In_  const credentials_type          &usr,
+            _In_  const credentials_type          &cred,
             _Out_       EAP_METHOD_PROPERTY_ARRAY *pMethodPropertyArray,
             _Out_       EAP_ERROR                 **ppEapError) const = 0;
 
diff --git a/lib/EAPBase_UI/include/Module.h b/lib/EAPBase_UI/include/Module.h
index aaba459..bcf8953 100644
--- a/lib/EAPBase_UI/include/Module.h
+++ b/lib/EAPBase_UI/include/Module.h
@@ -70,7 +70,7 @@ namespace eap
         /// \param[in]    hwndParent     Parent window
         /// \param[in]    dwFlags        Flags passed to `EapPeerInvokeIdentityUI()` call
         /// \param[inout] cfg            Configuration
-        /// \param[inout] usr            User data to edit
+        /// \param[inout] cred           User credentials to edit
         /// \param[out]   ppwszIdentity  Pointer to user identity. Free using `module::free_memory()`.
         /// \param[out]   ppEapError     Pointer to error descriptor in case of failure. Free using `module::free_error_memory()`.
         ///
@@ -82,7 +82,7 @@ namespace eap
             _In_    HWND                  hwndParent,
             _In_    DWORD                 dwFlags,
             _Inout_ config_providers_type &cfg,
-            _Inout_ credentials_type      &usr,
+            _Inout_ credentials_type      &cred,
             _Out_   LPWSTR                *ppwszIdentity,
             _Out_   EAP_ERROR             **ppEapError) = 0;
 
diff --git a/lib/TTLS/include/Module.h b/lib/TTLS/include/Module.h
index e3ded48..2eba224 100644
--- a/lib/TTLS/include/Module.h
+++ b/lib/TTLS/include/Module.h
@@ -77,7 +77,7 @@ namespace eap
         virtual bool get_identity(
             _In_          DWORD                 dwFlags,
             _In_    const config_providers_type &cfg,
-            _Inout_       credentials_type      &usr,
+            _Inout_       credentials_type      &cred,
             _In_          HANDLE                hTokenImpersonateUser,
             _Out_         BOOL                  *pfInvokeUI,
             _Out_         WCHAR                 **ppwszIdentity,
@@ -97,7 +97,7 @@ namespace eap
             _In_        DWORD                     dwFlags,
             _In_        HANDLE                    hUserImpersonationToken,
             _In_  const config_providers_type     &cfg,
-            _In_  const credentials_type          &usr,
+            _In_  const credentials_type          &cred,
             _Out_       EAP_METHOD_PROPERTY_ARRAY *pMethodPropertyArray,
             _Out_       EAP_ERROR                 **ppEapError) const;
     };
diff --git a/lib/TTLS/src/Module.cpp b/lib/TTLS/src/Module.cpp
index 321d4c6..bc00a3e 100644
--- a/lib/TTLS/src/Module.cpp
+++ b/lib/TTLS/src/Module.cpp
@@ -61,7 +61,7 @@ bool eap::peer_ttls::shutdown(_Out_ EAP_ERROR **ppEapError)
 bool eap::peer_ttls::get_identity(
     _In_          DWORD                 dwFlags,
     _In_    const config_providers_type &cfg,
-    _Inout_       credentials_type      &usr,
+    _Inout_       credentials_type      &cred,
     _In_          HANDLE                hTokenImpersonateUser,
     _Out_         BOOL                  *pfInvokeUI,
     _Out_         WCHAR                 **ppwszIdentity,
@@ -69,7 +69,7 @@ bool eap::peer_ttls::get_identity(
 {
     UNREFERENCED_PARAMETER(dwFlags);
     UNREFERENCED_PARAMETER(cfg);
-    UNREFERENCED_PARAMETER(usr);
+    UNREFERENCED_PARAMETER(cred);
     UNREFERENCED_PARAMETER(hTokenImpersonateUser);
     UNREFERENCED_PARAMETER(pfInvokeUI);
     UNREFERENCED_PARAMETER(ppwszIdentity);
@@ -85,7 +85,7 @@ bool eap::peer_ttls::get_method_properties(
     _In_        DWORD                     dwFlags,
     _In_        HANDLE                    hUserImpersonationToken,
     _In_  const config_providers_type     &cfg,
-    _In_  const credentials_type          &usr,
+    _In_  const credentials_type          &cred,
     _Out_       EAP_METHOD_PROPERTY_ARRAY *pMethodPropertyArray,
     _Out_       EAP_ERROR                 **ppEapError) const
 {
@@ -93,7 +93,7 @@ bool eap::peer_ttls::get_method_properties(
     UNREFERENCED_PARAMETER(dwFlags);
     UNREFERENCED_PARAMETER(hUserImpersonationToken);
     UNREFERENCED_PARAMETER(cfg);
-    UNREFERENCED_PARAMETER(usr);
+    UNREFERENCED_PARAMETER(cred);
     UNREFERENCED_PARAMETER(pMethodPropertyArray);
     UNREFERENCED_PARAMETER(ppEapError);
 
diff --git a/lib/TTLS_UI/include/Module.h b/lib/TTLS_UI/include/Module.h
index f52c127..fc3271c 100644
--- a/lib/TTLS_UI/include/Module.h
+++ b/lib/TTLS_UI/include/Module.h
@@ -69,7 +69,7 @@ namespace eap
         /// \param[in]    hwndParent     Parent window
         /// \param[in]    dwFlags        Flags passed to `EapPeerInvokeIdentityUI()` call
         /// \param[inout] cfg            Configuration
-        /// \param[inout] usr            User data to edit
+        /// \param[inout] cred           User credentials to edit
         /// \param[out]   ppwszIdentity  Pointer to user identity. Free using `module::free_memory()`.
         /// \param[out]   ppEapError     Pointer to error descriptor in case of failure. Free using `module::free_error_memory()`.
         ///
@@ -81,7 +81,7 @@ namespace eap
             _In_    HWND                  hwndParent,
             _In_    DWORD                 dwFlags,
             _Inout_ config_providers_type &cfg,
-            _Inout_ credentials_type      &usr,
+            _Inout_ credentials_type      &cred,
             _Out_   LPWSTR                *ppwszIdentity,
             _Out_   EAP_ERROR             **ppEapError);
 
diff --git a/lib/TTLS_UI/src/Module.cpp b/lib/TTLS_UI/src/Module.cpp
index 69e6071..debd693 100644
--- a/lib/TTLS_UI/src/Module.cpp
+++ b/lib/TTLS_UI/src/Module.cpp
@@ -72,13 +72,13 @@ bool eap::peer_ttls_ui::invoke_identity_ui(
             _In_    HWND                  hwndParent,
             _In_    DWORD                 dwFlags,
             _Inout_ config_providers_type &cfg,
-            _Inout_ credentials_type      &usr,
+            _Inout_ credentials_type      &cred,
             _Out_   LPWSTR                *ppwszIdentity,
             _Out_   EAP_ERROR             **ppEapError)
 {
     UNREFERENCED_PARAMETER(dwFlags);
     UNREFERENCED_PARAMETER(cfg);
-    UNREFERENCED_PARAMETER(usr);
+    UNREFERENCED_PARAMETER(cred);
     UNREFERENCED_PARAMETER(ppwszIdentity);
     UNREFERENCED_PARAMETER(ppEapError);