diff --git a/src/main/java/org/kohsuke/github/OrgInstallationAuthorizationProvider.java b/src/main/java/org/kohsuke/github/OrgAppInstallationAuthorizationProvider.java
similarity index 90%
rename from src/main/java/org/kohsuke/github/OrgInstallationAuthorizationProvider.java
rename to src/main/java/org/kohsuke/github/OrgAppInstallationAuthorizationProvider.java
index 8715ac19c..84134f83b 100644
--- a/src/main/java/org/kohsuke/github/OrgInstallationAuthorizationProvider.java
+++ b/src/main/java/org/kohsuke/github/OrgAppInstallationAuthorizationProvider.java
@@ -10,7 +10,7 @@ import javax.annotation.Nonnull;
 /**
  * Provides an AuthorizationProvider that performs automatic token refresh.
  */
-public class OrgInstallationAuthorizationProvider implements AuthorizationProvider {
+public class OrgAppInstallationAuthorizationProvider implements AuthorizationProvider {
 
     private GitHub baseGitHub;
     private GitHub gitHub;
@@ -35,7 +35,8 @@ public class OrgInstallationAuthorizationProvider implements AuthorizationProvid
      */
     @BetaApi
     @Deprecated
-    public OrgInstallationAuthorizationProvider(String organizationName, AuthorizationProvider authorizationProvider) {
+    public OrgAppInstallationAuthorizationProvider(String organizationName,
+            AuthorizationProvider authorizationProvider) {
         this.organizationName = organizationName;
         this.refreshProvider = authorizationProvider;
     }
diff --git a/src/test/java/org/kohsuke/github/OrgInstallationAuthorizationProviderTest.java b/src/test/java/org/kohsuke/github/OrgAppInstallationAuthorizationProviderTest.java
similarity index 74%
rename from src/test/java/org/kohsuke/github/OrgInstallationAuthorizationProviderTest.java
rename to src/test/java/org/kohsuke/github/OrgAppInstallationAuthorizationProviderTest.java
index c99b8a581..585d87fe7 100644
--- a/src/test/java/org/kohsuke/github/OrgInstallationAuthorizationProviderTest.java
+++ b/src/test/java/org/kohsuke/github/OrgAppInstallationAuthorizationProviderTest.java
@@ -7,15 +7,16 @@ import java.io.IOException;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.notNullValue;
 
-public class OrgInstallationAuthorizationProviderTest extends AbstractGHAppInstallationTest {
+public class OrgAppInstallationAuthorizationProviderTest extends AbstractGHAppInstallationTest {
 
-    public OrgInstallationAuthorizationProviderTest() {
+    public OrgAppInstallationAuthorizationProviderTest() {
         useDefaultGitHub = false;
     }
 
     @Test(expected = HttpException.class)
     public void invalidJWTTokenRaisesException() throws IOException {
-        OrgInstallationAuthorizationProvider provider = new OrgInstallationAuthorizationProvider("testOrganization",
+        OrgAppInstallationAuthorizationProvider provider = new OrgAppInstallationAuthorizationProvider(
+                "testOrganization",
                 ImmutableAuthorizationProvider.fromJwtToken("myToken"));
         gitHub = getGitHubBuilder().withAuthorizationProvider(provider)
                 .withEndpoint(mockGitHub.apiServer().baseUrl())
@@ -26,7 +27,7 @@ public class OrgInstallationAuthorizationProviderTest extends AbstractGHAppInsta
 
     @Test
     public void validJWTTokenAllowsOauthTokenRequest() throws IOException {
-        OrgInstallationAuthorizationProvider provider = new OrgInstallationAuthorizationProvider("hub4j-test-org",
+        OrgAppInstallationAuthorizationProvider provider = new OrgAppInstallationAuthorizationProvider("hub4j-test-org",
                 ImmutableAuthorizationProvider.fromJwtToken("bogus-valid-token"));
         gitHub = getGitHubBuilder().withAuthorizationProvider(provider)
                 .withEndpoint(mockGitHub.apiServer().baseUrl())
diff --git a/src/test/resources/org/kohsuke/github/OrgInstallationAuthorizationProviderTest/wiremock/invalidJWTTokenRaisesException/mappings/app-2.json b/src/test/resources/org/kohsuke/github/OrgAppInstallationAuthorizationProviderTest/wiremock/invalidJWTTokenRaisesException/mappings/app-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/OrgInstallationAuthorizationProviderTest/wiremock/invalidJWTTokenRaisesException/mappings/app-2.json
rename to src/test/resources/org/kohsuke/github/OrgAppInstallationAuthorizationProviderTest/wiremock/invalidJWTTokenRaisesException/mappings/app-2.json
diff --git a/src/test/resources/org/kohsuke/github/OrgInstallationAuthorizationProviderTest/wiremock/invalidJWTTokenRaisesException/mappings/user-1.json b/src/test/resources/org/kohsuke/github/OrgAppInstallationAuthorizationProviderTest/wiremock/invalidJWTTokenRaisesException/mappings/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/OrgInstallationAuthorizationProviderTest/wiremock/invalidJWTTokenRaisesException/mappings/user-1.json
rename to src/test/resources/org/kohsuke/github/OrgAppInstallationAuthorizationProviderTest/wiremock/invalidJWTTokenRaisesException/mappings/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/OrgInstallationAuthorizationProviderTest/wiremock/validJWTTokenAllowsOauthTokenRequest/__files/app-2.json b/src/test/resources/org/kohsuke/github/OrgAppInstallationAuthorizationProviderTest/wiremock/validJWTTokenAllowsOauthTokenRequest/__files/app-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/OrgInstallationAuthorizationProviderTest/wiremock/validJWTTokenAllowsOauthTokenRequest/__files/app-2.json
rename to src/test/resources/org/kohsuke/github/OrgAppInstallationAuthorizationProviderTest/wiremock/validJWTTokenAllowsOauthTokenRequest/__files/app-2.json
diff --git a/src/test/resources/org/kohsuke/github/OrgInstallationAuthorizationProviderTest/wiremock/validJWTTokenAllowsOauthTokenRequest/__files/orgs_hub4j-test-org_installation-3.json b/src/test/resources/org/kohsuke/github/OrgAppInstallationAuthorizationProviderTest/wiremock/validJWTTokenAllowsOauthTokenRequest/__files/orgs_hub4j-test-org_installation-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/OrgInstallationAuthorizationProviderTest/wiremock/validJWTTokenAllowsOauthTokenRequest/__files/orgs_hub4j-test-org_installation-3.json
rename to src/test/resources/org/kohsuke/github/OrgAppInstallationAuthorizationProviderTest/wiremock/validJWTTokenAllowsOauthTokenRequest/__files/orgs_hub4j-test-org_installation-3.json
diff --git a/src/test/resources/org/kohsuke/github/OrgInstallationAuthorizationProviderTest/wiremock/validJWTTokenAllowsOauthTokenRequest/mappings/app-2.json b/src/test/resources/org/kohsuke/github/OrgAppInstallationAuthorizationProviderTest/wiremock/validJWTTokenAllowsOauthTokenRequest/mappings/app-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/OrgInstallationAuthorizationProviderTest/wiremock/validJWTTokenAllowsOauthTokenRequest/mappings/app-2.json
rename to src/test/resources/org/kohsuke/github/OrgAppInstallationAuthorizationProviderTest/wiremock/validJWTTokenAllowsOauthTokenRequest/mappings/app-2.json
diff --git a/src/test/resources/org/kohsuke/github/OrgInstallationAuthorizationProviderTest/wiremock/validJWTTokenAllowsOauthTokenRequest/mappings/app_installations_11575015_access_tokens-4.json b/src/test/resources/org/kohsuke/github/OrgAppInstallationAuthorizationProviderTest/wiremock/validJWTTokenAllowsOauthTokenRequest/mappings/app_installations_11575015_access_tokens-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/OrgInstallationAuthorizationProviderTest/wiremock/validJWTTokenAllowsOauthTokenRequest/mappings/app_installations_11575015_access_tokens-4.json
rename to src/test/resources/org/kohsuke/github/OrgAppInstallationAuthorizationProviderTest/wiremock/validJWTTokenAllowsOauthTokenRequest/mappings/app_installations_11575015_access_tokens-4.json
diff --git a/src/test/resources/org/kohsuke/github/OrgInstallationAuthorizationProviderTest/wiremock/validJWTTokenAllowsOauthTokenRequest/mappings/orgs_hub4j-test-org_installation-3.json b/src/test/resources/org/kohsuke/github/OrgAppInstallationAuthorizationProviderTest/wiremock/validJWTTokenAllowsOauthTokenRequest/mappings/orgs_hub4j-test-org_installation-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/OrgInstallationAuthorizationProviderTest/wiremock/validJWTTokenAllowsOauthTokenRequest/mappings/orgs_hub4j-test-org_installation-3.json
rename to src/test/resources/org/kohsuke/github/OrgAppInstallationAuthorizationProviderTest/wiremock/validJWTTokenAllowsOauthTokenRequest/mappings/orgs_hub4j-test-org_installation-3.json
diff --git a/src/test/resources/org/kohsuke/github/OrgInstallationAuthorizationProviderTest/wiremock/validJWTTokenAllowsOauthTokenRequest/mappings/user-1.json b/src/test/resources/org/kohsuke/github/OrgAppInstallationAuthorizationProviderTest/wiremock/validJWTTokenAllowsOauthTokenRequest/mappings/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/OrgInstallationAuthorizationProviderTest/wiremock/validJWTTokenAllowsOauthTokenRequest/mappings/user-1.json
rename to src/test/resources/org/kohsuke/github/OrgAppInstallationAuthorizationProviderTest/wiremock/validJWTTokenAllowsOauthTokenRequest/mappings/user-1.json