diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml
index 619e4628..40b2b473 100644
--- a/.github/workflows/e2e-versions.yml
+++ b/.github/workflows/e2e-versions.yml
@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        distribution: ['adoptium', 'zulu']
+        distribution: ['adopt', 'zulu']
         version: ['8', '11', '15']
     steps:
       - name: Checkout
@@ -42,19 +42,19 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        distribution: ['adoptium', 'zulu']
+        distribution: ['adopt', 'zulu']
         version:
         - '11.0'
         - '8.0.282'
         - '11.0.2+7'
         include:
-          - distribution: 'adoptium'
+          - distribution: 'adopt'
             version: '12.0.2+10.1'
             os: macos-latest
-          - distribution: 'adoptium'
+          - distribution: 'adopt'
             version: '12.0.2+10.1'
             os: windows-latest
-          - distribution: 'adoptium'
+          - distribution: 'adopt'
             version: '12.0.2+10.1'
             os: ubuntu-latest
     steps:
@@ -89,8 +89,8 @@ jobs:
           java-version: ${{ matrix.version }}
           distribution: zulu
 
-  setup-java-ea-versions-adoptium:
-    name: adoptium ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }}
+  setup-java-ea-versions-adopt:
+    name: adopt ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }}
     needs: setup-java-major-minor-versions
     runs-on: ${{ matrix.os }}
     strategy:
@@ -106,7 +106,7 @@ jobs:
         id: setup-java
         with:
           java-version: ${{ matrix.version }}
-          distribution: adoptium
+          distribution: adopt
 
   setup-java-custom-package-type:
     name: ${{ matrix.distribution }} ${{ matrix.version }} (${{ matrix.java-package }}-x64) - ${{ matrix.os }}
@@ -116,7 +116,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        distribution: ['adoptium', 'zulu']
+        distribution: ['adopt', 'zulu']
         java-package: ['jre']
         version:
         - '15.0'
diff --git a/__tests__/data/adoptium.json b/__tests__/data/adopt.json
similarity index 100%
rename from __tests__/data/adoptium.json
rename to __tests__/data/adopt.json
diff --git a/__tests__/distributors/adoptium-installer.test.ts b/__tests__/distributors/adopt-installer.test.ts
similarity index 90%
rename from __tests__/distributors/adoptium-installer.test.ts
rename to __tests__/distributors/adopt-installer.test.ts
index 4a180ad8..61f16dad 100644
--- a/__tests__/distributors/adoptium-installer.test.ts
+++ b/__tests__/distributors/adopt-installer.test.ts
@@ -2,10 +2,10 @@ import { HttpClient } from '@actions/http-client';
 
 import * as semver from 'semver';
 
-import { AdoptiumDistribution } from '../../src/distributions/adoptium/installer';
+import { AdoptDistribution } from '../../src/distributions/adopt/installer';
 import { JavaInstallerOptions } from '../../src/distributions/base-models';
 
-let manifestData = require('../data/adoptium.json') as [];
+let manifestData = require('../data/adopt.json') as [];
 
 describe('getAvailableVersions', () => {
   let spyHttpClient: jest.SpyInstance;
@@ -45,7 +45,7 @@ describe('getAvailableVersions', () => {
   ])(
     'build correct url for %s',
     async (installerOptions: JavaInstallerOptions, expectedParameters) => {
-      const distribution = new AdoptiumDistribution(installerOptions);
+      const distribution = new AdoptDistribution(installerOptions);
       const baseUrl = 'https://api.adoptopenjdk.net/v3/assets/version/%5B1.0,100.0%5D';
       const expectedUrl = `${baseUrl}?project=jdk&vendor=adoptopenjdk&heap_size=normal&jvm_impl=hotspot&sort_method=DEFAULT&sort_order=DESC&${expectedParameters}`;
       distribution['getPlatformOption'] = () => 'mac';
@@ -76,7 +76,7 @@ describe('getAvailableVersions', () => {
         result: []
       });
 
-    const distribution = new AdoptiumDistribution({
+    const distribution = new AdoptDistribution({
       version: '11',
       arch: 'x64',
       packageType: 'jdk'
@@ -101,7 +101,7 @@ describe('findPackageForDownload', () => {
     ['15.0.1+9', '15.0.1+9'],
     ['15.0.1+9.1', '15.0.1+9.1']
   ])('version is resolved correctly %s -> %s', async (input, expected) => {
-    const distribution = new AdoptiumDistribution({
+    const distribution = new AdoptDistribution({
       version: '11',
       arch: 'x64',
       packageType: 'jdk'
@@ -112,7 +112,7 @@ describe('findPackageForDownload', () => {
   });
 
   it('version is found but binaries list is empty', async () => {
-    const distribution = new AdoptiumDistribution({
+    const distribution = new AdoptDistribution({
       version: '11',
       arch: 'x64',
       packageType: 'jdk'
@@ -124,7 +124,7 @@ describe('findPackageForDownload', () => {
   });
 
   it('version is not found', async () => {
-    const distribution = new AdoptiumDistribution({
+    const distribution = new AdoptDistribution({
       version: '11',
       arch: 'x64',
       packageType: 'jdk'
@@ -136,7 +136,7 @@ describe('findPackageForDownload', () => {
   });
 
   it('version list is empty', async () => {
-    const distribution = new AdoptiumDistribution({
+    const distribution = new AdoptDistribution({
       version: '11',
       arch: 'x64',
       packageType: 'jdk'