diff --git a/.github/workflows/ruby-2.3.yml b/.github/workflows/ruby-2.3.yml
deleted file mode 100644
index 069f6c61..00000000
--- a/.github/workflows/ruby-2.3.yml
+++ /dev/null
@@ -1,134 +0,0 @@
-name: Ruby 2.3.x
-
-on:
-  pull_request:
-    branches:
-      - master
-  push:
-    branches:
-      - master
-
-jobs:
-  activesupport_42:
-    name: ActiveSupport 4.2.x
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@master
-
-    - name: Setup Ruby
-      uses: actions/setup-ruby@v1
-      with:
-        version: 2.3.x
-
-    - uses: actions/cache@v1
-      id: bundle-42
-      with:
-        path: vendor/bundle
-        key: ${{ runner.os }}-${{ hashFiles('hubspot-api-ruby.gemspec') }}-${{ hashFiles('gemfiles/activesupport_4.2.gemfile') }}
-
-    - name: Install Dependencies
-      if: steps.bundle-42.outputs.cache-hit != 'true'
-      run: |
-        gem install bundler
-        bundle install --jobs=3 --retry=3 --path=vendor/bundle
-        bundle exec appraisal install
-      env:
-        BUNDLE_GEMFILE: gemfiles/activesupport_4.2.gemfile
-
-    - name: Tests
-      run: |
-        bundle exec appraisal rspec
-
-  activesupport_50:
-    name: ActiveSupport 5.0.x
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@master
-
-    - name: Setup Ruby
-      uses: actions/setup-ruby@v1
-      with:
-        version: 2.3.x
-
-    - uses: actions/cache@v1
-      id: bundle-50
-      with:
-        path: vendor/bundle
-        key: ${{ runner.os }}-${{ hashFiles('hubspot-api-ruby.gemspec') }}-${{ hashFiles('gemfiles/activesupport_5.0.gemfile') }}
-
-    - name: Install Dependencies
-      if: steps.bundle-50.outputs.cache-hit != 'true'
-      run: |
-        gem install bundler
-        bundle install --jobs=3 --retry=3 --path=vendor/bundle
-        bundle exec appraisal install
-      env:
-        BUNDLE_GEMFILE: gemfiles/activesupport_5.0.gemfile
-
-    - name: Tests
-      run: |
-        bundle exec appraisal rspec
-
-  activesupport_51:
-    name: ActiveSupport 5.1.x
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@master
-
-    - name: Setup Ruby
-      uses: actions/setup-ruby@v1
-      with:
-        version: 2.3.x
-
-    - uses: actions/cache@v1
-      id: bundle-51
-      with:
-        path: vendor/bundle
-        key: ${{ runner.os }}-${{ hashFiles('hubspot-api-ruby.gemspec') }}-${{ hashFiles('gemfiles/activesupport_5.1.gemfile') }}
-
-    - name: Install Dependencies
-      if: steps.bundle-51.outputs.cache-hit != 'true'
-      run: |
-        gem install bundler
-        bundle install --jobs=3 --retry=3 --path=vendor/bundle
-        bundle exec appraisal install
-      env:
-        BUNDLE_GEMFILE: gemfiles/activesupport_5.1.gemfile
-
-    - name: Tests
-      run: |
-        bundle exec appraisal rspec
-
-  activesupport_52:
-    name: ActiveSupport 5.2.x
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@master
-
-    - name: Setup Ruby
-      uses: actions/setup-ruby@v1
-      with:
-        version: 2.3.x
-
-    - uses: actions/cache@v1
-      id: bundle-52
-      with:
-        path: vendor/bundle
-        key: ${{ runner.os }}-${{ hashFiles('hubspot-api-ruby.gemspec') }}-${{ hashFiles('gemfiles/activesupport_5.2.gemfile') }}
-
-    - name: Install Dependencies
-      if: steps.bundle-52.outputs.cache-hit != 'true'
-      run: |
-        gem install bundler
-        bundle install --jobs=3 --retry=3 --path=vendor/bundle
-        bundle exec appraisal install
-      env:
-        BUNDLE_GEMFILE: gemfiles/activesupport_5.2.gemfile
-
-    - name: Tests
-      run: |
-        bundle exec appraisal rspec
diff --git a/.github/workflows/ruby-2.4.yml b/.github/workflows/ruby-2.4.yml
index 1d7e578a..0ae318ed 100644
--- a/.github/workflows/ruby-2.4.yml
+++ b/.github/workflows/ruby-2.4.yml
@@ -19,16 +19,16 @@ jobs:
     - name: Setup Ruby
       uses: actions/setup-ruby@v1
       with:
-        version: 2.4.x
+        ruby-version: 2.4.x
 
     - uses: actions/cache@v1
-      id: bundle-42
+      id: ruby-24-bundle-42
       with:
         path: vendor/bundle
         key: ${{ runner.os }}-${{ hashFiles('hubspot-api-ruby.gemspec') }}-${{ hashFiles('gemfiles/activesupport_4.2.gemfile') }}
 
     - name: Install Dependencies
-      if: steps.bundle-42.outputs.cache-hit != 'true'
+      if: steps.ruby-24-bundle-42.outputs.cache-hit != 'true'
       run: |
         gem install bundler
         bundle install --jobs=3 --retry=3 --path=vendor/bundle
@@ -50,16 +50,16 @@ jobs:
     - name: Setup Ruby
       uses: actions/setup-ruby@v1
       with:
-        version: 2.4.x
+        ruby-version: 2.4.x
 
     - uses: actions/cache@v1
-      id: bundle-50
+      id: ruby-24-bundle-50
       with:
         path: vendor/bundle
         key: ${{ runner.os }}-${{ hashFiles('hubspot-api-ruby.gemspec') }}-${{ hashFiles('gemfiles/activesupport_5.0.gemfile') }}
 
     - name: Install Dependencies
-      if: steps.bundle-50.outputs.cache-hit != 'true'
+      if: steps.ruby-24-bundle-50.outputs.cache-hit != 'true'
       run: |
         gem install bundler
         bundle install --jobs=3 --retry=3 --path=vendor/bundle
@@ -81,16 +81,16 @@ jobs:
     - name: Setup Ruby
       uses: actions/setup-ruby@v1
       with:
-        version: 2.4.x
+        ruby-version: 2.4.x
 
     - uses: actions/cache@v1
-      id: bundle-51
+      id: ruby-24-bundle-51
       with:
         path: vendor/bundle
         key: ${{ runner.os }}-${{ hashFiles('hubspot-api-ruby.gemspec') }}-${{ hashFiles('gemfiles/activesupport_5.1.gemfile') }}
 
     - name: Install Dependencies
-      if: steps.bundle-51.outputs.cache-hit != 'true'
+      if: steps.ruby-24-bundle-51.outputs.cache-hit != 'true'
       run: |
         gem install bundler
         bundle install --jobs=3 --retry=3 --path=vendor/bundle
@@ -112,16 +112,16 @@ jobs:
     - name: Setup Ruby
       uses: actions/setup-ruby@v1
       with:
-        version: 2.4.x
+        ruby-version: 2.4.x
 
     - uses: actions/cache@v1
-      id: bundle-52
+      id: ruby-24-bundle-52
       with:
         path: vendor/bundle
         key: ${{ runner.os }}-${{ hashFiles('hubspot-api-ruby.gemspec') }}-${{ hashFiles('gemfiles/activesupport_5.2.gemfile') }}
 
     - name: Install Dependencies
-      if: steps.bundle-52.outputs.cache-hit != 'true'
+      if: steps.ruby-24-bundle-52.outputs.cache-hit != 'true'
       run: |
         gem install bundler
         bundle install --jobs=3 --retry=3 --path=vendor/bundle
diff --git a/.github/workflows/ruby-2.5.yml b/.github/workflows/ruby-2.5.yml
index abae06d7..a54e8532 100644
--- a/.github/workflows/ruby-2.5.yml
+++ b/.github/workflows/ruby-2.5.yml
@@ -19,16 +19,16 @@ jobs:
     - name: Setup Ruby
       uses: actions/setup-ruby@v1
       with:
-        version: 2.5.x
+        ruby-version: 2.5.x
 
     - uses: actions/cache@v1
-      id: bundle-42
+      id: ruby-25-bundle-42
       with:
         path: vendor/bundle
         key: ${{ runner.os }}-${{ hashFiles('hubspot-api-ruby.gemspec') }}-${{ hashFiles('gemfiles/activesupport_4.2.gemfile') }}
 
     - name: Install Dependencies
-      if: steps.bundle-42.outputs.cache-hit != 'true'
+      if: steps.ruby-25-bundle-42.outputs.cache-hit != 'true'
       run: |
         gem install bundler
         bundle install --jobs=3 --retry=3 --path=vendor/bundle
@@ -50,16 +50,16 @@ jobs:
     - name: Setup Ruby
       uses: actions/setup-ruby@v1
       with:
-        version: 2.5.x
+        ruby-version: 2.5.x
 
     - uses: actions/cache@v1
-      id: bundle-50
+      id: ruby-25-bundle-50
       with:
         path: vendor/bundle
         key: ${{ runner.os }}-${{ hashFiles('hubspot-api-ruby.gemspec') }}-${{ hashFiles('gemfiles/activesupport_5.0.gemfile') }}
 
     - name: Install Dependencies
-      if: steps.bundle-50.outputs.cache-hit != 'true'
+      if: steps.ruby-25-bundle-50.outputs.cache-hit != 'true'
       run: |
         gem install bundler
         bundle install --jobs=3 --retry=3 --path=vendor/bundle
@@ -81,16 +81,16 @@ jobs:
     - name: Setup Ruby
       uses: actions/setup-ruby@v1
       with:
-        version: 2.5.x
+        ruby-version: 2.5.x
 
     - uses: actions/cache@v1
-      id: bundle-51
+      id: ruby-25-bundle-51
       with:
         path: vendor/bundle
         key: ${{ runner.os }}-${{ hashFiles('hubspot-api-ruby.gemspec') }}-${{ hashFiles('gemfiles/activesupport_5.1.gemfile') }}
 
     - name: Install Dependencies
-      if: steps.bundle-51.outputs.cache-hit != 'true'
+      if: steps.ruby-25-bundle-51.outputs.cache-hit != 'true'
       run: |
         gem install bundler
         bundle install --jobs=3 --retry=3 --path=vendor/bundle
@@ -112,16 +112,16 @@ jobs:
     - name: Setup Ruby
       uses: actions/setup-ruby@v1
       with:
-        version: 2.5.x
+        ruby-version: 2.5.x
 
     - uses: actions/cache@v1
-      id: bundle-52
+      id: ruby-25-bundle-52
       with:
         path: vendor/bundle
         key: ${{ runner.os }}-${{ hashFiles('hubspot-api-ruby.gemspec') }}-${{ hashFiles('gemfiles/activesupport_5.2.gemfile') }}
 
     - name: Install Dependencies
-      if: steps.bundle-52.outputs.cache-hit != 'true'
+      if: steps.ruby-25-bundle-52.outputs.cache-hit != 'true'
       run: |
         gem install bundler
         bundle install --jobs=3 --retry=3 --path=vendor/bundle
diff --git a/.github/workflows/ruby-2.6.yml b/.github/workflows/ruby-2.6.yml
index 46151caa..d48b228a 100644
--- a/.github/workflows/ruby-2.6.yml
+++ b/.github/workflows/ruby-2.6.yml
@@ -19,16 +19,16 @@ jobs:
     - name: Setup Ruby
       uses: actions/setup-ruby@v1
       with:
-        version: 2.6.x
+        ruby-version: 2.6.x
 
     - uses: actions/cache@v1
-      id: bundle-42
+      id: ruby-26-bundle-42
       with:
         path: vendor/bundle
         key: ${{ runner.os }}-${{ hashFiles('hubspot-api-ruby.gemspec') }}-${{ hashFiles('gemfiles/activesupport_4.2.gemfile') }}
 
     - name: Install Dependencies
-      if: steps.bundle-42.outputs.cache-hit != 'true'
+      if: steps.ruby-26-bundle-42.outputs.cache-hit != 'true'
       run: |
         gem install bundler
         bundle install --jobs=3 --retry=3 --path=vendor/bundle
@@ -50,16 +50,16 @@ jobs:
     - name: Setup Ruby
       uses: actions/setup-ruby@v1
       with:
-        version: 2.6.x
+        ruby-version: 2.6.x
 
     - uses: actions/cache@v1
-      id: bundle-50
+      id: ruby-26-bundle-50
       with:
         path: vendor/bundle
         key: ${{ runner.os }}-${{ hashFiles('hubspot-api-ruby.gemspec') }}-${{ hashFiles('gemfiles/activesupport_5.0.gemfile') }}
 
     - name: Install Dependencies
-      if: steps.bundle-50.outputs.cache-hit != 'true'
+      if: steps.ruby-26-bundle-50.outputs.cache-hit != 'true'
       run: |
         gem install bundler
         bundle install --jobs=3 --retry=3 --path=vendor/bundle
@@ -81,16 +81,16 @@ jobs:
     - name: Setup Ruby
       uses: actions/setup-ruby@v1
       with:
-        version: 2.6.x
+        ruby-version: 2.6.x
 
     - uses: actions/cache@v1
-      id: bundle-51
+      id: ruby-26-bundle-51
       with:
         path: vendor/bundle
         key: ${{ runner.os }}-${{ hashFiles('hubspot-api-ruby.gemspec') }}-${{ hashFiles('gemfiles/activesupport_5.1.gemfile') }}
 
     - name: Install Dependencies
-      if: steps.bundle-51.outputs.cache-hit != 'true'
+      if: steps.ruby-26-bundle-51.outputs.cache-hit != 'true'
       run: |
         gem install bundler
         bundle install --jobs=3 --retry=3 --path=vendor/bundle
@@ -112,16 +112,16 @@ jobs:
     - name: Setup Ruby
       uses: actions/setup-ruby@v1
       with:
-        version: 2.6.x
+        ruby-version: 2.6.x
 
     - uses: actions/cache@v1
-      id: bundle-52
+      id: ruby-26-bundle-52
       with:
         path: vendor/bundle
         key: ${{ runner.os }}-${{ hashFiles('hubspot-api-ruby.gemspec') }}-${{ hashFiles('gemfiles/activesupport_5.2.gemfile') }}
 
     - name: Install Dependencies
-      if: steps.bundle-52.outputs.cache-hit != 'true'
+      if: steps.ruby-26-bundle-52.outputs.cache-hit != 'true'
       run: |
         gem install bundler
         bundle install --jobs=3 --retry=3 --path=vendor/bundle