diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml
index e9811c1e6b..cd3c4b79b5 100644
--- a/.github/workflows/acceptance-tests.yml
+++ b/.github/workflows/acceptance-tests.yml
@@ -42,7 +42,7 @@ jobs:
         with:
           RUN_FILTER: ${{ env.RUN_FILTER }}
           GITHUB_BASE_URL: "https://api.github.com/"
-          GITHUB_ORGANIZATION: terraformtesting
+          GITHUB_OWNER: terraformtesting
           GITHUB_TEST_USER: github-terraform-test-user
           GITHUB_TEST_USER_NAME: "Test User"
           GITHUB_TEST_USER_EMAIL: 60107403+github-terraform-test-user@users.noreply.github.com
diff --git a/README.md b/README.md
index 8aeefb91bc..8f878827ff 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ Once the token has been created, it must be exported in your environment as `GIT
 
 ### GitHub organization
 If you do not have an organization already that you are comfortable running tests against, you will need to [create one](https://help.github.com/en/articles/creating-a-new-organization-from-scratch). The free "Team for Open Source" org type is fine for these tests. The name of the
-organization must then be exported in your environment as `GITHUB_ORGANIZATION`. If you are interested in using and/or testing Github's [Team synchronization](https://help.github.com/en/github/setting-up-and-managing-organizations-and-teams/synchronizing-teams-between-your-identity-provider-and-github) feature, you will need to have an organization that uses Github Enterprise Cloud in addition to the requirements defined in the Github docs and set the environment variable `ENTERPRISE_ACCOUNT` to `true`. 
+organization must then be exported in your environment as `GITHUB_OWNER`. If you are interested in using and/or testing Github's [Team synchronization](https://help.github.com/en/github/setting-up-and-managing-organizations-and-teams/synchronizing-teams-between-your-identity-provider-and-github) feature, you will need to have an organization that uses Github Enterprise Cloud in addition to the requirements defined in the Github docs and set the environment variable `ENTERPRISE_ACCOUNT` to `true`. 
 
 ### Test repositories
 In the organization you are using above, create the following test repositories:
diff --git a/github/data_source_github_release_test.go b/github/data_source_github_release_test.go
index da8763abc3..5d80a70fa5 100644
--- a/github/data_source_github_release_test.go
+++ b/github/data_source_github_release_test.go
@@ -34,7 +34,7 @@ func TestAccGithubReleaseDataSource_latestExisting(t *testing.T) {
 	}
 
 	repo := os.Getenv("GITHUB_TEMPLATE_REPOSITORY")
-	owner := os.Getenv("GITHUB_ORGANIZATION")
+	owner := os.Getenv("GITHUB_OWNER")
 	retrieveBy := "latest"
 	expectedUrl := regexp.MustCompile(fmt.Sprintf("%s/%s", owner, repo))
 	expectedTarball := regexp.MustCompile(fmt.Sprintf("%s/%s/tarball", owner, repo))
@@ -77,7 +77,7 @@ func TestAccGithubReleaseDataSource_fetchByIdExisting(t *testing.T) {
 	}
 
 	repo := os.Getenv("GITHUB_TEMPLATE_REPOSITORY")
-	owner := os.Getenv("GITHUB_ORGANIZATION")
+	owner := os.Getenv("GITHUB_OWNER")
 	retrieveBy := "id"
 	expectedUrl := regexp.MustCompile(fmt.Sprintf("%s/%s", owner, repo))
 	expectedTarball := regexp.MustCompile(fmt.Sprintf("%s/%s/tarball", owner, repo))
@@ -102,7 +102,7 @@ func TestAccGithubReleaseDataSource_fetchByIdExisting(t *testing.T) {
 
 func TestAccGithubReleaseDataSource_fetchByTagNoTagReturnsError(t *testing.T) {
 	repo := os.Getenv("GITHUB_TEMPLATE_REPOSITORY")
-	owner := os.Getenv("GITHUB_ORGANIZATION")
+	owner := os.Getenv("GITHUB_OWNER")
 	retrieveBy := "tag"
 	id := int64(0)
 	resource.ParallelTest(t, resource.TestCase{
@@ -125,7 +125,7 @@ func TestAccGithubReleaseDataSource_fetchByTagExisting(t *testing.T) {
 	}
 
 	repo := os.Getenv("GITHUB_TEMPLATE_REPOSITORY")
-	owner := os.Getenv("GITHUB_ORGANIZATION")
+	owner := os.Getenv("GITHUB_OWNER")
 	retrieveBy := "tag"
 	tag := "v1.0"
 	expectedUrl := regexp.MustCompile(fmt.Sprintf("%s/%s", owner, repo))