diff --git a/NSspi/Credentials/ClientCredential.cs b/NSspi/Credentials/ClientCurrentCredential.cs
similarity index 78%
rename from NSspi/Credentials/ClientCredential.cs
rename to NSspi/Credentials/ClientCurrentCredential.cs
index c65b959..d96acf4 100644
--- a/NSspi/Credentials/ClientCredential.cs
+++ b/NSspi/Credentials/ClientCurrentCredential.cs
@@ -5,13 +5,13 @@ namespace NSspi.Credentials
     /// <summary>
     /// Represents the credentials of the user running the current process, for use as an SSPI client.
     /// </summary>
-    public class ClientCredential : CurrentCredential
+    public class ClientCurrentCredential : CurrentCredential
     {
         /// <summary>
         /// Initializes a new instance of the ClientCredential class.
         /// </summary>
         /// <param name="package">The security package to acquire the credential handle from.</param>
-        public ClientCredential( string package )
+        public ClientCurrentCredential( string package )
             : base( package, CredentialUse.Outbound )
         {
         }
diff --git a/NSspi/Credentials/ServerCredential.cs b/NSspi/Credentials/ServerCurrentCredential.cs
similarity index 80%
rename from NSspi/Credentials/ServerCredential.cs
rename to NSspi/Credentials/ServerCurrentCredential.cs
index c24e187..c65d65e 100644
--- a/NSspi/Credentials/ServerCredential.cs
+++ b/NSspi/Credentials/ServerCurrentCredential.cs
@@ -5,14 +5,14 @@ namespace NSspi.Credentials
     /// <summary>
     /// Represents the credentials of the user running the current process, for use as an SSPI server.
     /// </summary>
-    public class ServerCredential : CurrentCredential
+    public class ServerCurrentCredential : CurrentCredential
     {
         /// <summary>
         /// Initializes a new instance of the ServerCredential class, acquiring credentials from
         /// the current thread's security context.
         /// </summary>
         /// <param name="package">The name of the security package to obtain credentials from.</param>
-        public ServerCredential( string package )
+        public ServerCurrentCredential( string package )
             : base( package, CredentialUse.Inbound )
         {
         }
diff --git a/NSspi/NSspi.csproj b/NSspi/NSspi.csproj
index a39fb5f..11649bf 100644
--- a/NSspi/NSspi.csproj
+++ b/NSspi/NSspi.csproj
@@ -55,18 +55,18 @@
     <Compile Include="Contexts\ContextQueryAttrib.cs" />
     <Compile Include="Contexts\ImpersonationHandle.cs" />
     <Compile Include="Contexts\SafeContextHandle.cs" />
+    <Compile Include="Credentials\ClientCurrentCredential.cs" />
     <Compile Include="Credentials\CurrentCredential.cs" />
+    <Compile Include="Credentials\ServerCurrentCredential.cs" />
     <Compile Include="EnumMgr.cs" />
     <Compile Include="SecPkgInfo.cs" />
     <Compile Include="Contexts\ServerContext.cs" />
-    <Compile Include="Credentials\ClientCredential.cs" />
     <Compile Include="Credentials\Credential.cs" />
     <Compile Include="Credentials\CredentialNativeMethods.cs" />
     <Compile Include="Credentials\CredentialQueryAttrib.cs" />
     <Compile Include="Credentials\CredentialUse.cs" />
     <Compile Include="Credentials\QueryNameSupport.cs" />
     <Compile Include="Credentials\SafeCredentialHandle.cs" />
-    <Compile Include="Credentials\ServerCredential.cs" />
     <Compile Include="NativeMethods.cs" />
     <Compile Include="PackageSupport.cs" />
     <Compile Include="PackageNames.cs" />
diff --git a/NsspiDemo/Program.cs b/NsspiDemo/Program.cs
index 87635e4..0d40d68 100644
--- a/NsspiDemo/Program.cs
+++ b/NsspiDemo/Program.cs
@@ -16,10 +16,10 @@ namespace NSspi
 
         private static void CredTest( string packageName )
         {
-            ClientCredential clientCred = null;
+            ClientCurrentCredential clientCred = null;
             ClientContext client = null;
 
-            ServerCredential serverCred = null;
+            ServerCurrentCredential serverCred = null;
             ServerContext server = null;
 
             byte[] clientToken;
@@ -30,8 +30,8 @@ namespace NSspi
 
             try
             {
-                clientCred = new ClientCredential( packageName );
-                serverCred = new ServerCredential( packageName );
+                clientCred = new ClientCurrentCredential( packageName );
+                serverCred = new ServerCurrentCredential( packageName );
 
                 Console.Out.WriteLine( clientCred.PrincipleName );
 
diff --git a/TestClient/ClientForm.cs b/TestClient/ClientForm.cs
index 1cec477..657bc71 100644
--- a/TestClient/ClientForm.cs
+++ b/TestClient/ClientForm.cs
@@ -14,7 +14,7 @@ namespace TestClient
     public partial class ClientForm : Form
     {
         private ClientContext context;
-        private ClientCredential cred;
+        private ClientCurrentCredential cred;
 
         private CustomConnection connection;
 
@@ -42,7 +42,7 @@ namespace TestClient
             this.FormClosing += Form1_FormClosing;
 
             // --- SSPI ---
-            this.cred = new ClientCredential( PackageNames.Negotiate );
+            this.cred = new ClientCurrentCredential( PackageNames.Negotiate );
 
             this.context = new ClientContext(
                 cred,
diff --git a/TestServer/ServerForm.cs b/TestServer/ServerForm.cs
index 6e63154..fdc8037 100644
--- a/TestServer/ServerForm.cs
+++ b/TestServer/ServerForm.cs
@@ -13,7 +13,7 @@ namespace TestServer
 
     public partial class ServerForm : Form
     {
-        private ServerCredential serverCred;
+        private ServerCurrentCredential serverCred;
 
         private ServerContext serverContext;
 
@@ -29,7 +29,7 @@ namespace TestServer
         {
             InitializeComponent();
 
-            this.serverCred = new ServerCredential( PackageNames.Negotiate );
+            this.serverCred = new ServerCurrentCredential( PackageNames.Negotiate );
 
             this.serverContext = new ServerContext(
                 serverCred,