diff --git a/SMBLibrary/Authentication/AuthenticateMessage/NTLMv2ClientChallenge.cs b/SMBLibrary/Authentication/AuthenticateMessage/NTLMv2ClientChallenge.cs
index 5092e52..adce1ef 100644
--- a/SMBLibrary/Authentication/AuthenticateMessage/NTLMv2ClientChallenge.cs
+++ b/SMBLibrary/Authentication/AuthenticateMessage/NTLMv2ClientChallenge.cs
@@ -14,7 +14,7 @@ namespace SMBLibrary.Authentication
     /// <summary>
     /// NTLMv2_CLIENT_CHALLENGE
     /// </summary>
-    public class NTLMv2ClientChallengeStructure
+    public class NTLMv2ClientChallenge
     {
         public static readonly DateTime EpochTime = DateTime.FromFileTimeUtc(0);
 
@@ -26,11 +26,11 @@ namespace SMBLibrary.Authentication
         public byte[] ClientChallenge; // 8-byte challenge message generated by the client
         public KeyValuePairList<AVPairKey, byte[]> AVPairs;
 
-        public NTLMv2ClientChallengeStructure()
+        public NTLMv2ClientChallenge()
         {
         }
 
-        public NTLMv2ClientChallengeStructure(DateTime time, byte[] clientChallenge, string domainName, string computerName)
+        public NTLMv2ClientChallenge(DateTime time, byte[] clientChallenge, string domainName, string computerName)
         {
             ResponseVersion = 1;
             ResponseVersionHigh = 1;
@@ -41,11 +41,11 @@ namespace SMBLibrary.Authentication
             AVPairs.Add(AVPairKey.NbComputerName, UnicodeEncoding.Unicode.GetBytes(computerName));
         }
 
-        public NTLMv2ClientChallengeStructure(byte[] buffer) : this(buffer, 0)
+        public NTLMv2ClientChallenge(byte[] buffer) : this(buffer, 0)
         {
         }
 
-        public NTLMv2ClientChallengeStructure(byte[] buffer, int offset)
+        public NTLMv2ClientChallenge(byte[] buffer, int offset)
         {
             ResponseVersion = ByteReader.ReadByte(buffer, offset + 0);
             ResponseVersionHigh = ByteReader.ReadByte(buffer, offset + 1);
diff --git a/SMBLibrary/Tests/AuthenticationTests.cs b/SMBLibrary/Tests/AuthenticationTests.cs
index 7999f68..bb627af 100644
--- a/SMBLibrary/Tests/AuthenticationTests.cs
+++ b/SMBLibrary/Tests/AuthenticationTests.cs
@@ -74,7 +74,7 @@ namespace SMBLibrary
             byte[] serverChallenge = new byte[] { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef };
             byte[] clientChallenge = new byte[] { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa };
             DateTime time = DateTime.FromFileTimeUtc(0); // same as new byte[8]
-            NTLMv2ClientChallengeStructure clientChallengeStructure = new NTLMv2ClientChallengeStructure(time, clientChallenge, "Domain", "Server");
+            NTLMv2ClientChallenge clientChallengeStructure = new NTLMv2ClientChallenge(time, clientChallenge, "Domain", "Server");
             byte[] clientChallengeStructurePadded = clientChallengeStructure.GetBytesPadded();
             byte[] clientNTProof = NTAuthentication.ComputeNTLMv2Proof(serverChallenge, clientChallengeStructurePadded, "Password", "User", "Domain");
 
@@ -132,7 +132,7 @@ namespace SMBLibrary
             byte[] clientChallenge = new byte[] { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa };
             byte[] serverAVPair = AVPairUtils.GetAVPairSequence("Domain", "Server");
             DateTime time = DateTime.FromFileTimeUtc(0); // same as new byte[8]
-            NTLMv2ClientChallengeStructure clientChallengeStructure = new NTLMv2ClientChallengeStructure(time, clientChallenge, "Domain", "Server");
+            NTLMv2ClientChallenge clientChallengeStructure = new NTLMv2ClientChallenge(time, clientChallenge, "Domain", "Server");
             byte[] clientChallengeStructurePadded = clientChallengeStructure.GetBytesPadded();
             byte[] clientNTProof = NTAuthentication.ComputeNTLMv2Proof(serverChallenge, clientChallengeStructurePadded, "Password", "User", "Domain");