diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ff17b10..a1a9dc7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,7 +5,7 @@ on: workflow_dispatch
 jobs:
   release:
     runs-on: ubuntu-latest
-    if: github.repository == 'puppetlabs/vmpooler-dns-google-clouddns'
+    if: github.repository == 'puppetlabs/vmpooler-dns-gcp'
     steps:
       - uses: actions/checkout@v3
 
@@ -25,9 +25,9 @@ jobs:
       - name: Get Next Version
         id: nv
         run: |
-          version=$(grep VERSION lib/vmpooler-dns-google-clouddns/version.rb |rev |cut -d "'" -f2 |rev)
+          version=$(grep VERSION lib/vmpooler-dns-gcp/version.rb |rev |cut -d "'" -f2 |rev)
           echo "version=$version" >> $GITHUB_OUTPUT
-          echo "Found version $version from lib/vmpooler-dns-google-clouddns/version.rb"
+          echo "Found version $version from lib/vmpooler-dns-gcp/version.rb"
 
       - name: Generate Changelog
         uses: docker://githubchangeloggenerator/github-changelog-generator:1.16.2
diff --git a/.github_changelog_generator b/.github_changelog_generator
index b978ce8..411780b 100644
--- a/.github_changelog_generator
+++ b/.github_changelog_generator
@@ -1,3 +1,3 @@
-project=vmpooler-dns-google-clouddns
+project=vmpooler-dns-gcp
 user=puppetlabs
-exclude_labels=maintenance
\ No newline at end of file
+exclude_labels=maintenance
diff --git a/Gemfile.lock b/Gemfile.lock
index 1680833..66d3ad3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vmpooler-dns-google-clouddns (0.1.0)
+    vmpooler-dns-gcp (0.1.0)
       google-cloud-dns (~> 0.35.1)
       googleauth (>= 0.16.2, < 1.3.0)
       vmpooler (~> 2.3, >= 1.3.0)
@@ -202,7 +202,7 @@ DEPENDENCIES
   rspec (>= 3.2)
   rubocop (~> 1.1.0)
   simplecov (>= 0.11.2)
-  vmpooler-dns-google-clouddns!
+  vmpooler-dns-gcp!
 
 BUNDLED WITH
    2.4.5
diff --git a/README.md b/README.md
index 6e6534d..0e29595 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# vmpooler-dns-google-clouddns
+# vmpooler-dns-gcp
 
-- [vmpooler-dns-google-clouddns](#vmpooler-dns-google-clouddns)
+- [vmpooler-dns-gcp](#vmpooler-dns-gcp)
   - [Usage](#usage)
   - [Update the Gemfile Lock](#update-the-gemfile-lock)
   - [Releasing](#releasing)
@@ -20,7 +20,7 @@ Verify, and update if needed, that the docker tag in the script and GitHub actio
 
 Follow these steps to publish a new GitHub release, and build and push the gem to <https://rubygems.org>.
 
-1. Bump the "VERSION" in `lib/vmpooler-dns-google-clouddns/version.rb` appropriately based on changes in `CHANGELOG.md` since the last release.
+1. Bump the "VERSION" in `lib/vmpooler-dns-gcp/version.rb` appropriately based on changes in `CHANGELOG.md` since the last release.
 2. Run `./update-gemfile-lock` to update `Gemfile.lock`.
 3. Run `./update-changelog` to update `CHANGELOG.md`.
 4. Commit and push changes to a new branch, then open a pull request against `main` and be sure to add the "maintenance" label.
@@ -28,4 +28,4 @@ Follow these steps to publish a new GitHub release, and build and push the gem t
 
 ## License
 
-vmpooler-dns-google-clouddns is distributed under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html). See the [LICENSE](LICENSE) file for more details.
+vmpooler-dns-gcp is distributed under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html). See the [LICENSE](LICENSE) file for more details.
diff --git a/lib/vmpooler-dns-google-clouddns/version.rb b/lib/vmpooler-dns-gcp/version.rb
similarity index 62%
rename from lib/vmpooler-dns-google-clouddns/version.rb
rename to lib/vmpooler-dns-gcp/version.rb
index fb3095a..c38e817 100644
--- a/lib/vmpooler-dns-google-clouddns/version.rb
+++ b/lib/vmpooler-dns-gcp/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-module VmpoolerDnsGoogleClouddns
+module VmpoolerDnsGcp
   VERSION = '0.1.0'
 end
diff --git a/lib/vmpooler/dns/google/clouddns.rb b/lib/vmpooler/dns/gcp/clouddns.rb
similarity index 92%
rename from lib/vmpooler/dns/google/clouddns.rb
rename to lib/vmpooler/dns/gcp/clouddns.rb
index 92a91c3..62b597c 100644
--- a/lib/vmpooler/dns/google/clouddns.rb
+++ b/lib/vmpooler/dns/gcp/clouddns.rb
@@ -6,7 +6,7 @@ require 'google/cloud/dns'
 module Vmpooler
   class PoolManager
     class Dns
-      class Google
+      class Gcp
         class Clouddns
           # Your code goes here...
         end
diff --git a/update-changelog b/update-changelog
index 52abc15..9f3ec69 100755
--- a/update-changelog
+++ b/update-changelog
@@ -2,4 +2,4 @@
 
 docker run -it --rm -e CHANGELOG_GITHUB_TOKEN -v $(pwd):/usr/local/src/your-app \
   githubchangeloggenerator/github-changelog-generator:1.16.2 \
-  github_changelog_generator --future-release $(grep VERSION lib/vmpooler-dns-google-clouddns/version.rb |rev |cut -d "'" -f2 |rev)
+  github_changelog_generator --future-release $(grep VERSION lib/vmpooler-dns-gcp/version.rb |rev |cut -d "'" -f2 |rev)
diff --git a/vmpooler-dns-google-clouddns.gemspec b/vmpooler-dns-gcp.gemspec
similarity index 75%
rename from vmpooler-dns-google-clouddns.gemspec
rename to vmpooler-dns-gcp.gemspec
index 5c0f10f..9a7a44c 100644
--- a/vmpooler-dns-google-clouddns.gemspec
+++ b/vmpooler-dns-gcp.gemspec
@@ -2,21 +2,20 @@
 
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'vmpooler-dns-google-clouddns/version'
+require 'vmpooler-dns-gcp/version'
 
 Gem::Specification.new do |spec|
-  spec.name    = "vmpooler-dns-google-clouddns"
-  spec.version = VmpoolerDnsGoogleClouddns::VERSION
+  spec.name    = "vmpooler-dns-gcp"
+  spec.version = VmpoolerDnsGcp::VERSION
   spec.authors = ["Puppet by Perforce"]
-  spec.email   = ["support@puppet.com"]
 
   spec.summary = "Google Cloud DNS for VMPooler"
-  spec.homepage = "https://github.com/puppetlabs/vmpooler-dns-google-clouddns"
+  spec.homepage = "https://github.com/puppetlabs/vmpooler-dns-gcp"
   spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["changelog_uri"] = "https://github.com/puppetlabs/vmpooler-dns-google-clouddns/blob/main/CHANGELOG.md"
+  spec.metadata["changelog_uri"] = "https://github.com/puppetlabs/vmpooler-dns-gcp/blob/main/CHANGELOG.md"
 
   # Specify which files should be added to the gem when it is released.
   spec.files = Dir[ "lib/**/*" ]