diff --git a/lib/PAP/src/Method.cpp b/lib/PAP/src/Method.cpp
index 0230057..052f6db 100644
--- a/lib/PAP/src/Method.cpp
+++ b/lib/PAP/src/Method.cpp
@@ -96,9 +96,9 @@ void eap::method_pap::process_request_packet(
 
         m_packet_res.clear();
 
-        // Diameter AVP (User-Name=0x00000001, User-Password=0x00000002)
-        append_avp(0x00000001, diameter_avp_flag_mandatory, identity_utf8.data(), (unsigned int)identity_utf8.size());
-        append_avp(0x00000002, diameter_avp_flag_mandatory, password_utf8.data(), (unsigned int)password_utf8.size());
+        // Diameter AVP (User-Name=1, User-Password=2)
+        append_avp(1, diameter_avp_flag_mandatory, identity_utf8.data(), (unsigned int)identity_utf8.size());
+        append_avp(2, diameter_avp_flag_mandatory, password_utf8.data(), (unsigned int)password_utf8.size());
 
         m_phase = phase_finished;
         break;
diff --git a/lib/TLS/include/Method.h b/lib/TLS/include/Method.h
index 50f5508..9084738 100644
--- a/lib/TLS/include/Method.h
+++ b/lib/TLS/include/Method.h
@@ -256,9 +256,9 @@ namespace eap
         /// \sa [The Transport Layer Security (TLS) Protocol Version 1.2 (Chapter 7.1. Change Cipher Spec Protocol)](https://tools.ietf.org/html/rfc5246#section-7.1)
         ///
         /// \param[in] msg       TLS change_cipher_spec message data
-        /// \param[in] msg_size  TLS change_cipher_spec message data size
+        /// \param[in] size_msg  TLS change_cipher_spec message data size
         ///
-        virtual void process_change_cipher_spec(_In_bytecount_(msg_size) const void *msg, _In_ size_t msg_size);
+        virtual void process_change_cipher_spec(_In_bytecount_(size_msg) const void *msg, _In_ size_t size_msg);
 
         ///
         /// Processes a TLS alert message
@@ -266,9 +266,9 @@ namespace eap
         /// \sa [The Transport Layer Security (TLS) Protocol Version 1.2 (Chapter 7.2. Alert Protocol)](https://tools.ietf.org/html/rfc5246#section-7.2)
         ///
         /// \param[in] msg       TLS alert message data
-        /// \param[in] msg_size  TLS alert message data size
+        /// \param[in] size_msg  TLS alert message data size
         ///
-        virtual void process_alert(_In_bytecount_(msg_size) const void *msg, _In_ size_t msg_size);
+        virtual void process_alert(_In_bytecount_(size_msg) const void *msg, _In_ size_t size_msg);
 
         ///
         /// Processes a TLS handshake message
@@ -276,9 +276,9 @@ namespace eap
         /// \sa [The Transport Layer Security (TLS) Protocol Version 1.2 (Chapter 7.4. Handshake Protocol)](https://tools.ietf.org/html/rfc5246#section-7.4)
         ///
         /// \param[in] msg       TLS handshake message data
-        /// \param[in] msg_size  TLS handshake message data size
+        /// \param[in] size_msg  TLS handshake message data size
         ///
-        virtual void process_handshake(_In_bytecount_(msg_size) const void *msg, _In_ size_t msg_size);
+        virtual void process_handshake(_In_bytecount_(size_msg) const void *msg, _In_ size_t size_msg);
 
 #else
         ///
@@ -298,9 +298,9 @@ namespace eap
         /// \sa [The Transport Layer Security (TLS) Protocol Version 1.2 (Chapter 10. Application Data Protocol)](https://tools.ietf.org/html/rfc5246#section-10)
         ///
         /// \param[in] msg       TLS application_data message data
-        /// \param[in] msg_size  TLS application_data message data size
+        /// \param[in] size_msg  TLS application_data message data size
         ///
-        virtual void process_application_data(_In_bytecount_(msg_size) const void *msg, _In_ size_t msg_size);
+        virtual void process_application_data(_In_bytecount_(size_msg) const void *msg, _In_ size_t size_msg);
 
         /// @}
 
diff --git a/lib/TLS/src/Method.cpp b/lib/TLS/src/Method.cpp
index 14ebd66..0ecb46a 100644
--- a/lib/TLS/src/Method.cpp
+++ b/lib/TLS/src/Method.cpp
@@ -894,9 +894,9 @@ void eap::method_tls::process_packet(_In_bytecount_(size_pck) const void *_pck,
 }
 
 
-void eap::method_tls::process_change_cipher_spec(_In_bytecount_(msg_size) const void *_msg, _In_ size_t msg_size)
+void eap::method_tls::process_change_cipher_spec(_In_bytecount_(size_msg) const void *_msg, _In_ size_t size_msg)
 {
-    if (msg_size < 1)
+    if (size_msg < 1)
         throw win_runtime_error(EAP_E_EAPHOST_METHOD_INVALID_PACKET, __FUNCTION__ " Incomplete change cipher spec.");
 
     const unsigned char *msg = (const unsigned char*)_msg;
@@ -952,9 +952,9 @@ void eap::method_tls::process_change_cipher_spec(_In_bytecount_(msg_size) const
 }
 
 
-void eap::method_tls::process_alert(_In_bytecount_(msg_size) const void *_msg, _In_ size_t msg_size)
+void eap::method_tls::process_alert(_In_bytecount_(size_msg) const void *_msg, _In_ size_t size_msg)
 {
-    if (msg_size < 2)
+    if (size_msg < 2)
         throw win_runtime_error(EAP_E_EAPHOST_METHOD_INVALID_PACKET, __FUNCTION__ " Incomplete alert.");
 
     const unsigned char *msg = (const unsigned char*)_msg;
@@ -968,9 +968,9 @@ void eap::method_tls::process_alert(_In_bytecount_(msg_size) const void *_msg, _
 }
 
 
-void eap::method_tls::process_handshake(_In_bytecount_(msg_size) const void *_msg, _In_ size_t msg_size)
+void eap::method_tls::process_handshake(_In_bytecount_(size_msg) const void *_msg, _In_ size_t size_msg)
 {
-    for (const unsigned char *msg = (const unsigned char*)_msg, *msg_end = msg + msg_size; msg < msg_end; ) {
+    for (const unsigned char *msg = (const unsigned char*)_msg, *msg_end = msg + size_msg; msg < msg_end; ) {
         // Parse record header.
         if (msg + sizeof(unsigned int) > msg_end)
             throw win_runtime_error(EAP_E_EAPHOST_METHOD_INVALID_PACKET, __FUNCTION__ " Incomplete record header.");