diff --git a/README.md b/README.md
index 4d301666..90fa1309 100644
--- a/README.md
+++ b/README.md
@@ -32,10 +32,10 @@ This Ansible role has the following features for:
 - Install JDK
 - Additional opportunity to install from zulu-fallback, s3, web, local source, chocolatey.
 
-**AdoptOpenJDK**
+**Adoptium**
 
 - Install JDK, JRE
-- Additional opportunity to install from adoptopenjdk-fallback, repositories, web, local source, s3, chocolatey.
+- Additional opportunity to install from adoptium-fallback, repositories, web, local source, s3, chocolatey.
 
 
 **SapMachine**
@@ -101,7 +101,7 @@ Requirements
    - 8
    - 11
    - 17
- - **Supported AdoptOpenJDK version**:
+ - **Supported Adoptium version**:
    - 8
    - 11
    - 12
@@ -156,7 +156,7 @@ Requirements
      - `oracle_java`
      - `sapjvm`
      - `zulu`
-     - `adoptopenjdk`
+     - `adoptium`
      - `sapmachine`
      - `dragonwell8`
      - `corretto`
@@ -169,15 +169,15 @@ Requirements
       - `jdk` (default)
       - `jre`
 
-  - `transport` Artifact source transport. Use `fallback` (OpenJDK, SAPJVM, AdoptOpenJDK, SapMachine, ZULU, Alibaba Dragonwell, Amazon Corretto distributions are supported), `repositories`(OpenJDK, AdoptOpenJDK, Amazon Corretto distributions are supported), `local`, `web` or `s3` according to your requirements.
+  - `transport` Artifact source transport. Use `fallback` (OpenJDK, SAPJVM, Adoptium, SapMachine, ZULU, Alibaba Dragonwell, Amazon Corretto distributions are supported), `repositories`(OpenJDK, Adoptium, Amazon Corretto distributions are supported), `local`, `web` or `s3` according to your requirements.
 
     Available:
       - `repositories` Installing java from system repositories (yum or apt, Linux only)
       - `web` Fetching artifact from custom web url
-      - `chocolatey` Windows specific package manager (Supported OpenJDK: JDK 11, 12 or JRE 8, SapMachine, ZULU, AdoptOpenJDK)
+      - `chocolatey` Windows specific package manager (Supported OpenJDK: JDK 11, 12 or JRE 8, SapMachine, ZULU, Adoptium)
       - `local` Local artifact stored on ansible master (can be used as cache for other transport)
       - `s3` Download artifact from s3 bucket (Linux clients only, for Windows please use other transports)
-      - `fallback` fetching artifacts from official sites (available for distributions: openjdk, sapjvm, zulu, adoptopenjdk, sapmachine, dragonwell8, corretto).   
+      - `fallback` fetching artifacts from official sites (available for distributions: openjdk, sapjvm, zulu, adoptium, sapmachine, dragonwell8, corretto).   
          This is *default* value for `transport` variable
 
         **Notice** using `s3` transport requires specific packages to be installed on target host:
@@ -226,8 +226,8 @@ Requirements
 
     default: `{{ lookup('env','AWS_SECRET_KEY') }}`
 
-#  Configure AdoptOpenJDK
-  - `adoptopenjdk_impl` AdoptOpenJDK Implementation
+#  Configure Adoptium
+  - `adoptium_impl` Adoptium Implementation
      - `hotspot` (default)
      - `openj9`
 
@@ -373,18 +373,18 @@ https://docs.ansible.com/ansible/latest/modules/aws_s3_module.html#requirements
       java_major_version: 17
       java_package: jdk
 ```
-### Installing AdoptOpenJDK 8-openj9-jre from adoptopenjdk-fallback:
+### Installing Adoptium 8-openj9-jre from adoptium-fallback:
 
 ```yaml
-- name: Install AdoptOpenJDK
+- name: Install Adoptium
   hosts: all
 
   roles:
     - role: lean_delivery.java
-      java_distribution: adoptopenjdk
+      java_distribution: adoptium
       transport: fallback
       java_package: jre
-      adoptopenjdk_impl: openj9
+      adoptium_impl: openj9
       java_major_version: 8
 ```
 
diff --git a/defaults/main.yml b/defaults/main.yml
index 8f1064ed..30ca362d 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -4,7 +4,7 @@
 #  - oracle_java
 #  - sapjvm
 #  - zulu
-#  - adoptopenjdk (not supported 9/10)
+#  - adoptium (not supported 9/10)
 #  - alibaba_dragonwell (8 only)
 #  - sapmachine
 #  - Amazon Corretto (supported only 8/11)
@@ -20,7 +20,7 @@ java_distribution: openjdk
 java_package: jdk
 
 # AdoptOpenJDK Implementation (hotspot/openj9)
-adoptopenjdk_impl: hotspot
+adoptium_impl: hotspot
 
 # OpenJDK Redhat: 8 (packages) / 11 (package for centos7, tarball for all other) / 12 (tarball)
 # OpenJDK Debian: 8 (packages) / 11 (package for ubuntu18, tarball for all other) / 12 (tarball)
@@ -52,7 +52,7 @@ transport: fallback
 # - "local" Local artifact
 # - "repositories" Install from repositories for Debian and RHEL
 # - "openjdk-fallback" Install from artifact downloaded from openjdk site
-# - "adoptopenjdk-fallback" Install from artifact downloaded from adoptopenjdk site
+# - "adoptium-fallback" Install from artifact downloaded from adoptium site
 # - "sapjvm-fallback" Install from artifact downloaded from SAP site
 # - "zulu-fallback" Install from artifact downloaded from AZUL site
 # - "sapmachine-fallback" Install from artifact downloaded from SapMachine site
diff --git a/molecule/cloud-aws-adoptopenjdk-11/molecule.yml b/molecule/cloud-aws-adoptium-11/molecule.yml
similarity index 78%
rename from molecule/cloud-aws-adoptopenjdk-11/molecule.yml
rename to molecule/cloud-aws-adoptium-11/molecule.yml
index a121a71e..4456b1c3 100644
--- a/molecule/cloud-aws-adoptopenjdk-11/molecule.yml
+++ b/molecule/cloud-aws-adoptium-11/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   yamllint
   ansible-lint
 platforms:
-  - name: test-aws-centos7-adoptopenjdk-hotspot-jre-tarball-11
+  - name: test-aws-centos7-adoptium-hotspot-jre-tarball-11
     image: ami-9887c6e7
     platform: centos7
     instance_type: t3.micro
@@ -23,12 +23,12 @@ platforms:
     ssh_user: centos
     groups:
       - rhel_family
-      - adoptopenjdk
+      - adoptium
       - hotspot
       - jre
-      - adoptopenjdk_fallback
+      - adoptium_fallback
 
-  - name: test-aws-ubuntu18-adoptopenjdk-openj9-jdk-tarball-11
+  - name: test-aws-ubuntu18-adoptium-openj9-jdk-tarball-11
     image: ami-012fd5eb46f56731f
     platform: ubuntu18
     instance_type: t3.micro
@@ -42,12 +42,12 @@ platforms:
     ssh_user: ubuntu
     groups:
       - debian_family
-      - adoptopenjdk
+      - adoptium
       - openj9
       - jdk
-      - adoptopenjdk_fallback
+      - adoptium_fallback
 
-  - name: test-aws-Debian9-adoptopenjdk-hotspot-jdk-repositories-11
+  - name: test-aws-Debian9-adoptium-hotspot-jdk-repositories-11
     image: ami-003f19e0e687de1cd
     platform: debian9
     instance_type: t3.micro
@@ -61,12 +61,12 @@ platforms:
     ssh_user: admin
     groups:
       - debian_family
-      - adoptopenjdk
+      - adoptium
       - hotspot
       - jdk
       - repositories
 
-#  - name: test-aws-centos8-adoptopenjdk-openj9-jre-repositories-11
+#  - name: test-aws-centos8-adoptium-openj9-jre-repositories-11
 #    image: ami-0ed2ad9dc845b42b6
 #    platform: centos8
 #    instance_type: t3.micro
@@ -80,12 +80,12 @@ platforms:
 #    ssh_user: centos
 #    groups:
 #      - rhel_family
-#      - adoptopenjdk
+#      - adoptium
 #      - openj9
 #      - jre
 #      - repositories
 
-  - name: test-aws-centos7-adoptopenjdk-local-11
+  - name: test-aws-centos7-adoptium-local-11
     image: ami-9887c6e7
     platform: centos7
     instance_type: t3.micro
@@ -99,7 +99,7 @@ platforms:
     ssh_user: centos
     groups:
       - rhel_family
-      - adoptopenjdk
+      - adoptium
       - local
 
 provisioner:
@@ -111,18 +111,18 @@ provisioner:
       callback_whitelist: profile_tasks,timer
   inventory:
     group_vars:
-      adoptopenjdk:
-        java_distribution: adoptopenjdk
+      adoptium:
+        java_distribution: adoptium
         java_major_version: 11
       jdk:
         java_package: jdk
       jre:
         java_package: jre
       openj9:
-        adoptopenjdk_impl: openj9
+        adoptium_impl: openj9
       hotspot:
-        adoptopenjdk_impl: hotspot
-      adoptopenjdk_fallback:
+        adoptium_impl: hotspot
+      adoptium_fallback:
         transport: fallback
       repositories:
         transport: repositories
@@ -131,10 +131,10 @@ provisioner:
         transport_local: /tmp/OpenJDK11U-jdk_x64_linux_hotspot_11.0.3_7.tar.gz
   playbooks:
     create: ../resources/provisioning/AWS/create.yml
-    prepare: ../cloud-aws-adoptopenjdk-11/prepare.yml
+    prepare: ../cloud-aws-adoptium-11/prepare.yml
     destroy: ../resources/provisioning/AWS/destroy.yml
     verify: ../resources/tests/verify.yml
 scenario:
-  name: cloud-aws-adoptopenjdk-11
+  name: cloud-aws-adoptium-11
 verifier:
   name: ansible
diff --git a/molecule/cloud-aws-adoptopenjdk-11/playbook.yml b/molecule/cloud-aws-adoptium-11/playbook.yml
similarity index 100%
rename from molecule/cloud-aws-adoptopenjdk-11/playbook.yml
rename to molecule/cloud-aws-adoptium-11/playbook.yml
diff --git a/molecule/cloud-aws-adoptopenjdk-11/prepare.yml b/molecule/cloud-aws-adoptium-11/prepare.yml
similarity index 94%
rename from molecule/cloud-aws-adoptopenjdk-11/prepare.yml
rename to molecule/cloud-aws-adoptium-11/prepare.yml
index 126e9704..4c0d605d 100644
--- a/molecule/cloud-aws-adoptopenjdk-11/prepare.yml
+++ b/molecule/cloud-aws-adoptium-11/prepare.yml
@@ -52,7 +52,7 @@
   gather_facts: true
   vars:
     transport_s3_bucket: java-molecule-s3-test
-    transport_s3_path: /java/adoptopenjdk/OpenJDK11U-jdk_x64_linux_hotspot_11.0.3_7.tar.gz
+    transport_s3_path: /java/adoptium/OpenJDK11U-jdk_x64_linux_hotspot_11.0.3_7.tar.gz
     java_download_path: /tmp
   tasks:
     - name: Download artifact from s3
diff --git a/molecule/cloud-aws-adoptopenjdk-12/molecule.yml b/molecule/cloud-aws-adoptium-12/molecule.yml
similarity index 78%
rename from molecule/cloud-aws-adoptopenjdk-12/molecule.yml
rename to molecule/cloud-aws-adoptium-12/molecule.yml
index a80757ad..420de019 100644
--- a/molecule/cloud-aws-adoptopenjdk-12/molecule.yml
+++ b/molecule/cloud-aws-adoptium-12/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   yamllint
   ansible-lint
 platforms:
-#  - name: test-aws-centos8-adoptopenjdk-hotspot-jre-repositories-12
+#  - name: test-aws-centos8-adoptium-hotspot-jre-repositories-12
 #    image: ami-0ed2ad9dc845b42b6
 #    platform: centos8
 #    instance_type: t3.micro
@@ -23,13 +23,13 @@ platforms:
 #    ssh_user: centos
 #    groups:
 #      - rhel_family
-#      - adoptopenjdk
+#      - adoptium
 #      - hotspot
 #      - jre
 #      - repositories
 #      - pip3
 
-  - name: test-aws-centos7-adoptopenjdk-openj9-jdk-tarball-12
+  - name: test-aws-centos7-adoptium-openj9-jdk-tarball-12
     image: ami-9887c6e7
     platform: centos7
     instance_type: t3.micro
@@ -43,13 +43,13 @@ platforms:
     ssh_user: centos
     groups:
       - rhel_family
-      - adoptopenjdk
+      - adoptium
       - openj9
       - jdk
-      - adoptopenjdk_fallback
+      - adoptium_fallback
       - pip2
 
-  - name: test-aws-Debian9-adoptopenjdk-openj9-jre-tarball-12
+  - name: test-aws-Debian9-adoptium-openj9-jre-tarball-12
     image: ami-003f19e0e687de1cd
     platform: debian9
     instance_type: t3.micro
@@ -63,13 +63,13 @@ platforms:
     ssh_user: admin
     groups:
       - debian_family
-      - adoptopenjdk
+      - adoptium
       - openj9
       - jre
-      - adoptopenjdk_fallback
+      - adoptium_fallback
       - pip2
 
-  - name: test-aws-ubuntu18-adoptopenjdk-hotspot-jdk-repositories-12
+  - name: test-aws-ubuntu18-adoptium-hotspot-jdk-repositories-12
     image: ami-012fd5eb46f56731f
     platform: ubuntu18
     instance_type: t3.micro
@@ -83,13 +83,13 @@ platforms:
     ssh_user: ubuntu
     groups:
       - debian_family
-      - adoptopenjdk
+      - adoptium
       - hotspot
       - jdk
       - repositories
       - pip3
 
-  - name: test-aws-Debian9-adoptopenjdk-hotspot-jre-repositories-12
+  - name: test-aws-Debian9-adoptium-hotspot-jre-repositories-12
     image: ami-003f19e0e687de1cd
     platform: debian9
     instance_type: t3.micro
@@ -103,13 +103,13 @@ platforms:
     ssh_user: admin
     groups:
       - debian_family
-      - adoptopenjdk
+      - adoptium
       - hotspot
       - jre
       - repositories
       - pip2
 
-  - name: test-aws-Debian9-adoptopenjdk-s3-12
+  - name: test-aws-Debian9-adoptium-s3-12
     image: ami-003f19e0e687de1cd
     profile_name: epmldi-instance-profile
     platform: debian9
@@ -124,7 +124,7 @@ platforms:
     ssh_user: admin
     groups:
       - debian_family
-      - adoptopenjdk
+      - adoptium
       - s3
       - pip2
 
@@ -143,33 +143,33 @@ provisioner:
       pip3:
         pip_executable: pip3
         python_executable: python3
-      adoptopenjdk:
-        java_distribution: adoptopenjdk
+      adoptium:
+        java_distribution: adoptium
         java_major_version: 12
       jdk:
         java_package: jdk
       jre:
         java_package: jre
       openj9:
-        adoptopenjdk_impl: openj9
+        adoptium_impl: openj9
       hotspot:
-        adoptopenjdk_impl: hotspot
-      adoptopenjdk_fallback:
+        adoptium_impl: hotspot
+      adoptium_fallback:
         transport: fallback
       repositories:
         transport: repositories
       s3:
         transport: s3
         transport_s3_bucket: java-molecule-s3-test
-        transport_s3_path: /java/adoptopenjdk/OpenJDK12U-jdk_x64_linux_hotspot_12.0.1_12.tar.gz
+        transport_s3_path: /java/adoptium/OpenJDK12U-jdk_x64_linux_hotspot_12.0.1_12.tar.gz
         transport_s3_aws_access_key: "{{ lookup('env','AWS_ACCESS_KEY_ID') }}"
         transport_s3_aws_secret_key: "{{ lookup('env','AWS_SECRET_ACCESS_KEY') }}"
   playbooks:
     create: ../resources/provisioning/AWS/create.yml
-    prepare: ../cloud-aws-adoptopenjdk-12/prepare.yml
+    prepare: ../cloud-aws-adoptium-12/prepare.yml
     destroy: ../resources/provisioning/AWS/destroy.yml
     verify: ../resources/tests/verify.yml
 scenario:
-  name: cloud-aws-adoptopenjdk-12
+  name: cloud-aws-adoptium-12
 verifier:
   name: ansible
diff --git a/molecule/cloud-aws-adoptopenjdk-12/playbook.yml b/molecule/cloud-aws-adoptium-12/playbook.yml
similarity index 100%
rename from molecule/cloud-aws-adoptopenjdk-12/playbook.yml
rename to molecule/cloud-aws-adoptium-12/playbook.yml
diff --git a/molecule/cloud-aws-adoptopenjdk-12/prepare.yml b/molecule/cloud-aws-adoptium-12/prepare.yml
similarity index 100%
rename from molecule/cloud-aws-adoptopenjdk-12/prepare.yml
rename to molecule/cloud-aws-adoptium-12/prepare.yml
diff --git a/molecule/cloud-aws-adoptopenjdk-8/molecule.yml b/molecule/cloud-aws-adoptium-8/molecule.yml
similarity index 80%
rename from molecule/cloud-aws-adoptopenjdk-8/molecule.yml
rename to molecule/cloud-aws-adoptium-8/molecule.yml
index 4ebfdbf6..3c057ae4 100644
--- a/molecule/cloud-aws-adoptopenjdk-8/molecule.yml
+++ b/molecule/cloud-aws-adoptium-8/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   yamllint
   ansible-lint
 platforms:
-  - name: test-aws-Debian9-adoptopenjdk-hotspot-jdk-tarball-8
+  - name: test-aws-Debian9-adoptium-hotspot-jdk-tarball-8
     image: ami-003f19e0e687de1cd
     platform: debian9
     instance_type: t3.micro
@@ -23,12 +23,12 @@ platforms:
     ssh_user: admin
     groups:
       - debian_family
-      - adoptopenjdk
+      - adoptium
       - hotspot
       - jdk
-      - adoptopenjdk_fallback
+      - adoptium_fallback
 
-  - name: test-aws-ubuntu18-adoptopenjdk-openj9-jre-tarball-8
+  - name: test-aws-ubuntu18-adoptium-openj9-jre-tarball-8
     image: ami-012fd5eb46f56731f
     platform: ubuntu18
     instance_type: t3.micro
@@ -42,12 +42,12 @@ platforms:
     ssh_user: ubuntu
     groups:
       - debian_family
-      - adoptopenjdk
+      - adoptium
       - openj9
       - jre
-      - adoptopenjdk_fallback
+      - adoptium_fallback
 
-  - name: test-aws-centos7-adoptopenjdk-hotspot-jdk-repositories-8
+  - name: test-aws-centos7-adoptium-hotspot-jdk-repositories-8
     image: ami-9887c6e7
     platform: centos7
     instance_type: t3.micro
@@ -61,12 +61,12 @@ platforms:
     ssh_user: centos
     groups:
       - rhel_family
-      - adoptopenjdk
+      - adoptium
       - hotspot
       - jdk
       - repositories
 
-  - name: test-aws-amazon2-adoptopenjdk-openj9-jre-repositories-8
+  - name: test-aws-amazon2-adoptium-openj9-jre-repositories-8
     image: ami-0b898040803850657
     platform: amazon2
     instance_type: t3.micro
@@ -80,12 +80,12 @@ platforms:
     ssh_user: ec2-user
     groups:
       - rhel_family
-      - adoptopenjdk
+      - adoptium
       - openj9
       - jre
       - repositories
 
-  - name: test-aws-ubuntu18-adoptopenjdk-web-8
+  - name: test-aws-ubuntu18-adoptium-web-8
     image: ami-012fd5eb46f56731f
     platform: ubuntu18
     instance_type: t3.micro
@@ -99,7 +99,7 @@ platforms:
     ssh_user: ubuntu
     groups:
       - debian_family
-      - adoptopenjdk
+      - adoptium
       - web
 
 provisioner:
@@ -111,18 +111,18 @@ provisioner:
       callback_whitelist: profile_tasks,timer
   inventory:
     group_vars:
-      adoptopenjdk:
-        java_distribution: adoptopenjdk
+      adoptium:
+        java_distribution: adoptium
         java_major_version: 8
       jdk:
         java_package: jdk
       jre:
         java_package: jre
       openj9:
-        adoptopenjdk_impl: openj9
+        adoptium_impl: openj9
       hotspot:
-        adoptopenjdk_impl: hotspot
-      adoptopenjdk_fallback:
+        adoptium_impl: hotspot
+      adoptium_fallback:
         transport: fallback
       repositories:
         transport: repositories
@@ -136,6 +136,6 @@ provisioner:
     destroy: ../resources/provisioning/AWS/destroy.yml
     verify: ../resources/tests/verify.yml
 scenario:
-  name: cloud-aws-adoptopenjdk-8
+  name: cloud-aws-adoptium-8
 verifier:
   name: ansible
diff --git a/molecule/cloud-aws-adoptopenjdk-8/playbook.yml b/molecule/cloud-aws-adoptium-8/playbook.yml
similarity index 100%
rename from molecule/cloud-aws-adoptopenjdk-8/playbook.yml
rename to molecule/cloud-aws-adoptium-8/playbook.yml
diff --git a/molecule/cloud-aws-adoptopenjdk-windows/molecule.yml b/molecule/cloud-aws-adoptium-windows/molecule.yml
similarity index 80%
rename from molecule/cloud-aws-adoptopenjdk-windows/molecule.yml
rename to molecule/cloud-aws-adoptium-windows/molecule.yml
index 14f379ff..3ea702b6 100644
--- a/molecule/cloud-aws-adoptopenjdk-windows/molecule.yml
+++ b/molecule/cloud-aws-adoptium-windows/molecule.yml
@@ -10,7 +10,7 @@ lint:
   options:
     config-file: .yamllint
 platforms:
-  - name: test-aws-windows2016-adoptopenjdk-tarball-13
+  - name: test-aws-windows2016-adoptium-tarball-13
     aws_image_id: ami-00a20f508263efd30
     platform: windows2016core
     aws_region: us-east-1
@@ -22,12 +22,12 @@ platforms:
     vpc_subnet_id: subnet-0f2b9cd66faea38af
     groups:
       - windows
-      - adoptopenjdk
+      - adoptium
       - hotspot
       - jdk
-      - adoptopenjdk_fallback
+      - adoptium_fallback
 
-  - name: test-aws-windows2019-adoptopenjdk-tarball-13
+  - name: test-aws-windows2019-adoptium-tarball-13
     aws_image_id: ami-0477b9335a5a75438
     platform: windows2019core
     aws_region: us-east-1
@@ -39,12 +39,12 @@ platforms:
     vpc_subnet_id: subnet-0f2b9cd66faea38af
     groups:
       - windows
-      - adoptopenjdk
+      - adoptium
       - openj9
       - jre
-      - adoptopenjdk_fallback
+      - adoptium_fallback
 
-  - name: test-aws-windows2016-adoptopenjdk-chocolatey-13
+  - name: test-aws-windows2016-adoptium-chocolatey-13
     aws_image_id: ami-00a20f508263efd30
     platform: windows2016core
     aws_region: us-east-1
@@ -56,12 +56,12 @@ platforms:
     vpc_subnet_id: subnet-314c223d
     groups:
       - windows
-      - adoptopenjdk
+      - adoptium
       - hotspot
       - jdk
       - chocolatey
 
-  - name: test-aws-windows2019-adoptopenjdk-chocolatey-13
+  - name: test-aws-windows2019-adoptium-chocolatey-13
     aws_image_id: ami-0477b9335a5a75438
     platform: windows2019core
     aws_region: us-east-1
@@ -73,7 +73,7 @@ platforms:
     vpc_subnet_id: subnet-314c223d
     groups:
       - windows
-      - adoptopenjdk
+      - adoptium
       - openj9
       - jre
       - chocolatey
@@ -83,18 +83,18 @@ provisioner:
   log: false
   inventory:
     group_vars:
-      adoptopenjdk:
-        java_distribution: adoptopenjdk
+      adoptium:
+        java_distribution: adoptium
         java_major_version: 13
       jdk:
         java_package: jdk
       jre:
         java_package: jre
       openj9:
-        adoptopenjdk_impl: openj9
+        adoptium_impl: openj9
       hotspot:
-        adoptopenjdk_impl: hotspot
-      adoptopenjdk_fallback:
+        adoptium_impl: hotspot
+      adoptium_fallback:
         transport: fallback
       chocolatey:
         transport: chocolatey
@@ -113,7 +113,7 @@ provisioner:
   lint:
     name: ansible-lint
 scenario:
-  name: cloud-aws-adoptopenjdk-windows
+  name: cloud-aws-adoptium-windows
 verifier:
   name: ansible
   lint:
diff --git a/molecule/cloud-aws-adoptopenjdk-windows/playbook.yml b/molecule/cloud-aws-adoptium-windows/playbook.yml
similarity index 100%
rename from molecule/cloud-aws-adoptopenjdk-windows/playbook.yml
rename to molecule/cloud-aws-adoptium-windows/playbook.yml
diff --git a/molecule/cloud-azure-adoptopenjdk-windows/molecule.yml b/molecule/cloud-azure-adoptium-windows/molecule.yml
similarity index 81%
rename from molecule/cloud-azure-adoptopenjdk-windows/molecule.yml
rename to molecule/cloud-azure-adoptium-windows/molecule.yml
index 9c803a6d..0ea16464 100644
--- a/molecule/cloud-azure-adoptopenjdk-windows/molecule.yml
+++ b/molecule/cloud-azure-adoptium-windows/molecule.yml
@@ -10,7 +10,7 @@ lint:
   options:
     config-file: .yamllint
 platforms:
-  - name: test-azure-windows2016-adoptopenjdk-tarball-11
+  - name: test-azure-windows2016-adoptium-tarball-11
     platform: windows2016core
     vm_size: Standard_D2s_v3
     az_location: northeurope
@@ -21,12 +21,12 @@ platforms:
     az_network_security_group: epm-ldi-northeurope-sg
     groups:
       - windows
-      - adoptopenjdk
+      - adoptium
       - hotspot
       - jdk
-      - adoptopenjdk_fallback
+      - adoptium_fallback
 
-  - name: test-azure-windows2019-adoptopenjdk-tarball-11
+  - name: test-azure-windows2019-adoptium-tarball-11
     platform: windows2019core
     vm_size: Standard_D2s_v3
     az_location: northeurope
@@ -37,12 +37,12 @@ platforms:
     az_network_security_group: epm-ldi-northeurope-sg
     groups:
       - windows
-      - adoptopenjdk
+      - adoptium
       - openj9
       - jre
-      - adoptopenjdk_fallback
+      - adoptium_fallback
 
-  - name: test-azure-windows2016-adoptopenjdk-chocolatey-13
+  - name: test-azure-windows2016-adoptium-chocolatey-13
     platform: windows2016core
     vm_size: Standard_D2s_v3
     az_location: northeurope
@@ -53,12 +53,12 @@ platforms:
     az_network_security_group: epm-ldi-northeurope-sg
     groups:
       - windows
-      - adoptopenjdk
+      - adoptium
       - hotspot
       - jdk
       - chocolatey
 
-  - name: test-azure-windows2019-adoptopenjdk-chocolatey-13
+  - name: test-azure-windows2019-adoptium-chocolatey-13
     platform: windows2019core
     vm_size: Standard_D2s_v3
     az_location: northeurope
@@ -69,7 +69,7 @@ platforms:
     az_network_security_group: epm-ldi-northeurope-sg
     groups:
       - windows
-      - adoptopenjdk
+      - adoptium
       - openj9
       - jre
       - chocolatey
@@ -79,17 +79,17 @@ provisioner:
   log: true
   inventory:
     group_vars:
-      adoptopenjdk:
-        java_distribution: adoptopenjdk
+      adoptium:
+        java_distribution: adoptium
       jdk:
         java_package: jdk
       jre:
         java_package: jre
       openj9:
-        adoptopenjdk_impl: openj9
+        adoptium_impl: openj9
       hotspot:
-        adoptopenjdk_impl: hotspot
-      adoptopenjdk_fallback:
+        adoptium_impl: hotspot
+      adoptium_fallback:
         transport: fallback
         java_major_version: 11
       chocolatey:
@@ -110,7 +110,7 @@ provisioner:
   lint:
     name: ansible-lint
 scenario:
-  name: cloud-azure-adoptopenjdk-windows
+  name: cloud-azure-adoptium-windows
 verifier:
   name: ansible
   lint:
diff --git a/molecule/cloud-azure-adoptopenjdk-windows/playbook.yml b/molecule/cloud-azure-adoptium-windows/playbook.yml
similarity index 100%
rename from molecule/cloud-azure-adoptopenjdk-windows/playbook.yml
rename to molecule/cloud-azure-adoptium-windows/playbook.yml
diff --git a/tasks/Linux/fetch/adoptopenjdk-fallback.yml b/tasks/Linux/fetch/adoptium-fallback.yml
similarity index 93%
rename from tasks/Linux/fetch/adoptopenjdk-fallback.yml
rename to tasks/Linux/fetch/adoptium-fallback.yml
index 386bd228..d0f9ae42 100644
--- a/tasks/Linux/fetch/adoptopenjdk-fallback.yml
+++ b/tasks/Linux/fetch/adoptium-fallback.yml
@@ -1,15 +1,15 @@
 ---
 - name: Fetch download page
   uri:
-    url: "{{ adoptopenjdk_api_page }}\
+    url: "{{ adoptium_api_page }}\
       assets/feature_releases/{{ java_major_version }}/ga\
       ?architecture={{ (java_arch == 'x64') | ternary('x64', 'x32') }}\
       &heap_size=normal\
       &image_type={{ java_package }}\
-      &jvm_impl={{ adoptopenjdk_impl }}\
+      &jvm_impl={{ adoptium_impl }}\
       &os=linux\
       &project=jdk\
-      &vendor=adoptopenjdk"
+      &vendor=adoptium"
     return_content: true
     follow_redirects: all
   register: download_page
diff --git a/tasks/Linux/install/Debian_adoptopenjdk.yml b/tasks/Linux/install/Debian_adoptium.yml
similarity index 76%
rename from tasks/Linux/install/Debian_adoptopenjdk.yml
rename to tasks/Linux/install/Debian_adoptium.yml
index 240b8898..130728e3 100644
--- a/tasks/Linux/install/Debian_adoptopenjdk.yml
+++ b/tasks/Linux/install/Debian_adoptium.yml
@@ -1,15 +1,15 @@
 ---
 - name: Add apt-key for AdoptOpenJDK
   apt_key:
-    url: https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public
+    url: https://adoptium.jfrog.io/adoptium/api/gpg/key/public
     state: present
   register: package_install
   until: package_install is succeeded
 
 - name: Add repository for AdoptOpenJDK
   apt_repository:
-    repo: 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ bionic main'
-    filename: adoptopenjdk
+    repo: 'deb https://adoptium.jfrog.io/adoptium/deb/ bionic main'
+    filename: adoptium
     state: present
     codename: trusty
     update_cache: true
diff --git a/tasks/Linux/install/RedHat_adoptopenjdk.yml b/tasks/Linux/install/RedHat_adoptium.yml
similarity index 74%
rename from tasks/Linux/install/RedHat_adoptopenjdk.yml
rename to tasks/Linux/install/RedHat_adoptium.yml
index 90be6b81..60a39617 100644
--- a/tasks/Linux/install/RedHat_adoptopenjdk.yml
+++ b/tasks/Linux/install/RedHat_adoptium.yml
@@ -3,11 +3,11 @@
   yum_repository:
     name: AdoptOpenJDK
     description: AdoptOpenJDK
-    baseurl: "http://adoptopenjdk.jfrog.io/adoptopenjdk/rpm/centos/\
+    baseurl: "http://adoptium.jfrog.io/adoptium/rpm/centos/\
               {{ rh_dist_repo_version }}/x86_64"
     enabled: true
     gpgcheck: true
-    gpgkey: https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public
+    gpgkey: https://adoptium.jfrog.io/adoptium/api/gpg/key/public
 
 - name: Install java packages
   yum:
diff --git a/tasks/Win32NT/fetch/adoptopenjdk-fallback.yml b/tasks/Win32NT/fetch/adoptium-fallback.yml
similarity index 93%
rename from tasks/Win32NT/fetch/adoptopenjdk-fallback.yml
rename to tasks/Win32NT/fetch/adoptium-fallback.yml
index 078bbfbd..e7de1ec8 100644
--- a/tasks/Win32NT/fetch/adoptopenjdk-fallback.yml
+++ b/tasks/Win32NT/fetch/adoptium-fallback.yml
@@ -1,15 +1,15 @@
 ---
 - name: Fetch download page
   win_uri:
-    url: "{{ adoptopenjdk_api_page }}\
+    url: "{{ adoptium_api_page }}\
       assets/feature_releases/{{ java_major_version }}/ga\
       ?architecture={{ (java_arch == 'x64') | ternary('x64', 'x32') }}\
       &heap_size=normal\
       &image_type={{ java_package }}\
-      &jvm_impl={{ adoptopenjdk_impl }}\
+      &jvm_impl={{ adoptium_impl }}\
       &os=windows\
       &project=jdk\
-      &vendor=adoptopenjdk"
+      &vendor=adoptium"
     return_content: true
     follow_redirects: all
   register: download_page
diff --git a/tasks/Win32NT/install/adoptopenjdk_tarball.yml b/tasks/Win32NT/install/adoptium_tarball.yml
similarity index 100%
rename from tasks/Win32NT/install/adoptopenjdk_tarball.yml
rename to tasks/Win32NT/install/adoptium_tarball.yml
diff --git a/vars/java_distro_configs/adoptopenjdk_vars.yml b/vars/java_distro_configs/adoptium_vars.yml
similarity index 67%
rename from vars/java_distro_configs/adoptopenjdk_vars.yml
rename to vars/java_distro_configs/adoptium_vars.yml
index ee97f85c..77747b67 100644
--- a/vars/java_distro_configs/adoptopenjdk_vars.yml
+++ b/vars/java_distro_configs/adoptium_vars.yml
@@ -1,5 +1,5 @@
 ---
-adoptopenjdk_api_page: https://api.adoptopenjdk.net/v3/
+adoptium_api_page: https://api.adoptium.net/v3/
 parts: >-
   {{ java_artifact_basename | default('undefined', true)
     | regex_findall('^OpenJ[DKRE]{1,2}[0-9]+U[\-]*([jdkre]+)'
@@ -22,24 +22,24 @@ java_jre_suffix: >-
 java_jre_regex_suffix: >-
   {{ (java_package == 'jdk') | ternary('[^-jre]$', '[jre]') }}
 
-adoptopenjdk_choco_folder: >-
+adoptium_choco_folder: >-
   {{ java_package ~ '[-]*' ~ java_major_version|string ~ '.*' }}
 
-adoptopenjdk_folder: >-
-  {{ (transport == 'chocolatey') | ternary(adoptopenjdk_choco_folder, java_def_folder_ext_transport) }}
+adoptium_folder: >-
+  {{ (transport == 'chocolatey') | ternary(adoptium_choco_folder, java_def_folder_ext_transport) }}
 
 jdk_package: >-
-  {{ 'adoptopenjdk-' + java_major_version|string+ '-' + adoptopenjdk_impl|string
+  {{ 'adoptium-' + java_major_version|string+ '-' + adoptium_impl|string
                   + ((java_package == 'jre') | ternary('-' + java_package, '')) }}
 
 java_folder_repo_transport: >-
-  {{ 'adoptopenjdk-' ~ java_major_version|string ~ '-' ~ adoptopenjdk_impl|string
+  {{ 'adoptium-' ~ java_major_version|string ~ '-' ~ adoptium_impl|string
         ~ ((java_package == 'jre') | ternary('-' ~ java_package, '')) }}
 
 java_folder: >-
   {{ (not java_tarball_install|bool and (ansible_system == 'Linux'))
-      | ternary(java_folder_repo_transport, adoptopenjdk_folder) }}
+      | ternary(java_folder_repo_transport, adoptium_folder) }}
 
-choco_java_package: 'adoptopenjdk{{ java_package_suffix }}{{ java_jre_suffix }}'
+choco_java_package: 'adoptium{{ java_package_suffix }}{{ java_jre_suffix }}'
 
 choco_path: 'C:\Program Files\AdoptOpenJDK'
diff --git a/vars/java_parts.yml b/vars/java_parts.yml
index 80b64886..e93d7f37 100644
--- a/vars/java_parts.yml
+++ b/vars/java_parts.yml
@@ -2,7 +2,7 @@
 java_package: >-
   {{ ((java_distribution == "dragonwell8") or (java_distribution == "corretto"))
     | ternary("jdk", parts[0]) | default("jdk") }}
-java_major_version: '{{ (java_distribution == "adoptopenjdk") | ternary(parts[4], parts[1]) }}'
-java_minor_version: '{{ (java_distribution == "adoptopenjdk") | ternary(parts[5], parts[2]) }}'
+java_major_version: '{{ (java_distribution == "adoptium") | ternary(parts[4], parts[1]) }}'
+java_minor_version: '{{ (java_distribution == "adoptium") | ternary(parts[5], parts[2]) }}'
 java_os: '{{ parts[3] }}'
-java_arch: '{{ (java_distribution == "adoptopenjdk") | ternary(parts[1], parts[4] | default("x64")) }}'
+java_arch: '{{ (java_distribution == "adoptium") | ternary(parts[1], parts[4] | default("x64")) }}'