diff --git a/Octokit.Tests.Integration/Clients/Enterprise/EnterpriseOrganizationClientTests.cs b/Octokit.Tests.Integration/Clients/Enterprise/EnterpriseOrganizationClientTests.cs
index 61ace7d204..ce77ae3b46 100644
--- a/Octokit.Tests.Integration/Clients/Enterprise/EnterpriseOrganizationClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/Enterprise/EnterpriseOrganizationClientTests.cs
@@ -20,7 +20,7 @@ public async Task CanCreateOrganization()
         string orgLogin = Helper.MakeNameWithTimestamp("MyOrganization");
         string orgName = String.Concat(orgLogin, " Display Name");
 
-        var newOrganization = new NewOrganization(orgLogin, EnterpriseHelper.GHEUserName, orgName);
+        var newOrganization = new NewOrganization(orgLogin, EnterpriseHelper.UserName, orgName);
         var organization = await
             _github.Enterprise.Organization.Create(newOrganization);
 
diff --git a/Octokit.Tests.Integration/EnterpriseHelper.cs b/Octokit.Tests.Integration/EnterpriseHelper.cs
index 27f237d0c7..9a1ab54e06 100644
--- a/Octokit.Tests.Integration/EnterpriseHelper.cs
+++ b/Octokit.Tests.Integration/EnterpriseHelper.cs
@@ -9,8 +9,8 @@ public static class EnterpriseHelper
         static readonly Lazy<Credentials> _credentialsThunk = new Lazy<Credentials>(() =>
         {
             var githubUsername = Environment.GetEnvironmentVariable("OCTOKIT_GHE_USERNAME");
-            GHEUserName = githubUsername;
-            GHEOrganization = Environment.GetEnvironmentVariable("OCTOKIT_GHE_ORGANIZATION");
+            UserName = githubUsername;
+            Organization = Environment.GetEnvironmentVariable("OCTOKIT_GHE_ORGANIZATION");
 
             var githubToken = Environment.GetEnvironmentVariable("OCTOKIT_GHE_OAUTHTOKEN");
 
@@ -39,8 +39,8 @@ public static class EnterpriseHelper
         static readonly Lazy<Credentials> _basicAuthCredentials = new Lazy<Credentials>(() =>
         {
             var githubUsername = Environment.GetEnvironmentVariable("OCTOKIT_GHE_USERNAME");
-            GHEUserName = githubUsername;
-            GHEOrganization = Environment.GetEnvironmentVariable("OCTOKIT_GHE_ORGANIZATION");
+            UserName = githubUsername;
+            Organization = Environment.GetEnvironmentVariable("OCTOKIT_GHE_ORGANIZATION");
 
             var githubPassword = Environment.GetEnvironmentVariable("OCTOKIT_GHE_PASSWORD");
 
@@ -71,20 +71,20 @@ static EnterpriseHelper()
             // Force reading of environment variables.
             // This wasn't happening if UserName/Organization were 
             // retrieved before Credentials.
-            Debug.WriteIf(GHECredentials == null, "No credentials specified.");
+            Debug.WriteIf(Credentials == null, "No credentials specified.");
         }
 
-        public static string GHEUserName { get; private set; }
-        public static string GHEOrganization { get; private set; }
+        public static string UserName { get; private set; }
+        public static string Organization { get; private set; }
       
         /// <summary>
         /// These credentials should be set to a test GitHub account using the powershell script configure-integration-tests.ps1
         /// </summary>
-        public static Credentials GHECredentials { get { return _credentialsThunk.Value; } }
+        public static Credentials Credentials { get { return _credentialsThunk.Value; } }
 
-        public static Credentials GHEApplicationCredentials { get { return _oauthApplicationCredentials.Value; } }
+        public static Credentials ApplicationCredentials { get { return _oauthApplicationCredentials.Value; } }
 
-        public static Credentials GHEBasicAuthCredentials { get { return _basicAuthCredentials.Value; } }
+        public static Credentials BasicAuthCredentials { get { return _basicAuthCredentials.Value; } }
 
         public static bool IsGitHubEnterpriseEnabled { get { return _gitHubEnterpriseEnabled.Value; } }
 
@@ -128,7 +128,7 @@ public static IGitHubClient GetAuthenticatedClient()
         {
             return new GitHubClient(new ProductHeaderValue("OctokitEnterpriseTests"), GitHubEnterpriseUrl)
             {
-                Credentials = GHECredentials
+                Credentials = Credentials
             };
         }
 
@@ -136,7 +136,7 @@ public static IGitHubClient GetBasicAuthClient()
         {
             return new GitHubClient(new ProductHeaderValue("OctokitEnterpriseTests"), GitHubEnterpriseUrl)
             {
-                Credentials = GHEBasicAuthCredentials
+                Credentials = BasicAuthCredentials
             };
         }
 
@@ -144,7 +144,7 @@ public static GitHubClient GetAuthenticatedApplicationClient()
         {
             return new GitHubClient(new ProductHeaderValue("OctokitEnterpriseTests"), GitHubEnterpriseUrl)
             {
-                Credentials = GHEApplicationCredentials
+                Credentials = ApplicationCredentials
             };
         }
 
diff --git a/Octokit.Tests.Integration/Reactive/Enterprise/ObservableEnterpriseOrganizationClientTests.cs b/Octokit.Tests.Integration/Reactive/Enterprise/ObservableEnterpriseOrganizationClientTests.cs
index c0816f68ea..28997bada0 100644
--- a/Octokit.Tests.Integration/Reactive/Enterprise/ObservableEnterpriseOrganizationClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/Enterprise/ObservableEnterpriseOrganizationClientTests.cs
@@ -21,7 +21,7 @@ public async Task CanCreateOrganization()
             string orgLogin = Helper.MakeNameWithTimestamp("MyOrganization");
             string orgName = String.Concat(orgLogin, " Display Name");
 
-            var newOrganization = new NewOrganization(orgLogin, EnterpriseHelper.GHEUserName, orgName);
+            var newOrganization = new NewOrganization(orgLogin, EnterpriseHelper.UserName, orgName);
             var observable = _github.Enterprise.Organization.Create(newOrganization);
             var organization = await observable;