diff --git a/build.gradle b/build.gradle
index 23da0d90..65b1fb89 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,9 +62,9 @@ task prepareScripts(type: Copy) {
     include '**/*'
     filter(ReplaceTokens, tokens:
             [
-                    SDKMAN_VERSION        : sdkmanCliBuildVersion,
-                    SDKMAN_SERVICE        : config.sdkmanLegacyApi,
-                    SDKMAN_CURRENT_SERVICE: config.sdkmanCurrentApi
+                    SDKMAN_VERSION       : sdkmanCliBuildVersion,
+                    SDKMAN_LEGACY_API: config.sdkmanLegacyApi,
+                    SDKMAN_CURRENT_API       : config.sdkmanCurrentApi
             ]
     )
 }
diff --git a/src/main/bash/sdkman-availability.sh b/src/main/bash/sdkman-availability.sh
index 53312ee6..4c51b288 100644
--- a/src/main/bash/sdkman-availability.sh
+++ b/src/main/bash/sdkman-availability.sh
@@ -26,7 +26,7 @@ function __sdkman_determine_broadcast_id {
 	if [[ "$SDKMAN_OFFLINE_MODE" == "true" || "$COMMAND" == "offline" && "$QUALIFIER" == "enable" ]]; then
 		echo ""
 	else
-		echo $(__sdkman_secure_curl_with_timeouts "${SDKMAN_CURRENT_SERVICE}/broadcast/latest/id")
+		echo $(__sdkman_secure_curl_with_timeouts "${SDKMAN_CURRENT_API}/broadcast/latest/id")
 	fi
 }
 
@@ -87,7 +87,7 @@ function __sdkman_update_broadcast {
 
 		echo "$broadcast_live_id" > "$broadcast_id_file"
 
-		BROADCAST_LIVE_TEXT=$(__sdkman_secure_curl "${SDKMAN_CURRENT_SERVICE}/broadcast/latest")
+		BROADCAST_LIVE_TEXT=$(__sdkman_secure_curl "${SDKMAN_CURRENT_API}/broadcast/latest")
 		echo "$BROADCAST_LIVE_TEXT" > "$broadcast_text_file"
 		if [[ "$COMMAND" != "broadcast" ]]; then
 			echo "$BROADCAST_LIVE_TEXT"
diff --git a/src/main/bash/sdkman-env-helpers.sh b/src/main/bash/sdkman-env-helpers.sh
index e6d511f3..fe77f2de 100644
--- a/src/main/bash/sdkman-env-helpers.sh
+++ b/src/main/bash/sdkman-env-helpers.sh
@@ -59,10 +59,10 @@ function __sdkman_determine_version {
 
 	elif [[ "$SDKMAN_AVAILABLE" == "true" && -z "$version" ]]; then
 		VERSION_VALID='valid'
-		VERSION=$(__sdkman_secure_curl "${SDKMAN_SERVICE}/candidates/${candidate}/default")
+		VERSION=$(__sdkman_secure_curl "${SDKMAN_LEGACY_API}/candidates/${candidate}/default")
 
 	else
-		VERSION_VALID=$(__sdkman_secure_curl "${SDKMAN_SERVICE}/candidates/${candidate}/${version}")
+		VERSION_VALID=$(__sdkman_secure_curl "${SDKMAN_LEGACY_API}/candidates/${candidate}/${version}")
 		if [[ "$VERSION_VALID" == 'valid' || "$VERSION_VALID" == 'invalid' && -n "$folder" ]]; then
 			VERSION="$version"
 
diff --git a/src/main/bash/sdkman-init.sh b/src/main/bash/sdkman-init.sh
index 88028dc4..48c8c3c2 100644
--- a/src/main/bash/sdkman-init.sh
+++ b/src/main/bash/sdkman-init.sh
@@ -22,12 +22,12 @@ if [ -z "$SDKMAN_VERSION" ]; then
     export SDKMAN_VERSION="@SDKMAN_VERSION@"
 fi
 
-if [ -z "$SDKMAN_SERVICE" ]; then
-    export SDKMAN_SERVICE="@SDKMAN_SERVICE@"
+if [ -z "$SDKMAN_LEGACY_API" ]; then
+    export SDKMAN_LEGACY_API="@SDKMAN_LEGACY_API@"
 fi
 
-if [ -z "$SDKMAN_CURRENT_SERVICE" ]; then
-    export SDKMAN_CURRENT_SERVICE="@SDKMAN_CURRENT_SERVICE@"
+if [ -z "$SDKMAN_CURRENT_API" ]; then
+    export SDKMAN_CURRENT_API="@SDKMAN_CURRENT_API@"
 fi
 
 if [ -z "$SDKMAN_DIR" ]; then
@@ -116,7 +116,7 @@ fi
 if [[ -f "${SDKMAN_DIR}/var/candidates" ]]; then
 	SDKMAN_CANDIDATES_CSV=$(cat "${SDKMAN_DIR}/var/candidates")
 else
-	SDKMAN_CANDIDATES_CSV=$(__sdkman_secure_curl "${SDKMAN_SERVICE}/candidates")
+	SDKMAN_CANDIDATES_CSV=$(__sdkman_secure_curl "${SDKMAN_LEGACY_API}/candidates")
 	echo "$SDKMAN_CANDIDATES_CSV" > "${SDKMAN_DIR}/var/candidates"
 fi
 
@@ -136,7 +136,7 @@ if [[ -f "$SDKMAN_VERSION_TOKEN" && -z "$(find "$SDKMAN_VERSION_TOKEN" -mmin +$(
     SDKMAN_REMOTE_VERSION=$(cat "$SDKMAN_VERSION_TOKEN")
 
 else
-    SDKMAN_REMOTE_VERSION=$(__sdkman_secure_curl_with_timeouts "${SDKMAN_SERVICE}/app/cliversion")
+    SDKMAN_REMOTE_VERSION=$(__sdkman_secure_curl_with_timeouts "${SDKMAN_LEGACY_API}/app/cliversion")
 	DETECT_HTML="$(echo "$SDKMAN_REMOTE_VERSION" | tr '[:upper:]' '[:lower:]' | grep 'html')"
     if [[ -z "$SDKMAN_REMOTE_VERSION" || -n "$DETECT_HTML" ]]; then
         SDKMAN_REMOTE_VERSION="$SDKMAN_VERSION"
diff --git a/src/main/bash/sdkman-install.sh b/src/main/bash/sdkman-install.sh
index 9eff918b..1a2082d0 100644
--- a/src/main/bash/sdkman-install.sh
+++ b/src/main/bash/sdkman-install.sh
@@ -102,7 +102,7 @@ function __sdkman_download {
 		echo ""
 		echo "In progress..."
 		echo ""
-		local download_url="${SDKMAN_CURRENT_SERVICE}/broker/download/${candidate}/${version}?platform=${SDKMAN_PLATFORM}"
+		local download_url="${SDKMAN_CURRENT_API}/broker/download/${candidate}/${version}?platform=${SDKMAN_PLATFORM}"
 		local zip_archive="${SDKMAN_DIR}/archives/${candidate}-${version}.zip"
 		__sdkman_secure_curl_download "$download_url" > "$zip_archive"
 	else
diff --git a/src/main/bash/sdkman-list.sh b/src/main/bash/sdkman-list.sh
index e5fa54d6..c2bb3a73 100644
--- a/src/main/bash/sdkman-list.sh
+++ b/src/main/bash/sdkman-list.sh
@@ -30,7 +30,7 @@ function __sdkman_list_candidates {
 	if [[ "$SDKMAN_AVAILABLE" == "false" ]]; then
 		echo "This command is not available while offline."
 	else
-		__sdkman_page echo "$(__sdkman_secure_curl "${SDKMAN_SERVICE}/candidates/list")"
+		__sdkman_page echo "$(__sdkman_secure_curl "${SDKMAN_LEGACY_API}/candidates/list")"
 	fi
 }
 
@@ -44,7 +44,7 @@ function __sdkman_list_versions {
 	if [[ "$SDKMAN_AVAILABLE" == "false" ]]; then
 		__sdkman_offline_list "$candidate" "$versions_csv"
 	else
-        echo "$(__sdkman_secure_curl "${SDKMAN_SERVICE}/candidates/${candidate}/list?current=${CURRENT}&installed=${versions_csv}")"
+        echo "$(__sdkman_secure_curl "${SDKMAN_LEGACY_API}/candidates/${candidate}/list?current=${CURRENT}&installed=${versions_csv}")"
 	fi
 }
 
diff --git a/src/main/bash/sdkman-outdated.sh b/src/main/bash/sdkman-outdated.sh
index 42ec9644..7f3a3634 100644
--- a/src/main/bash/sdkman-outdated.sh
+++ b/src/main/bash/sdkman-outdated.sh
@@ -71,7 +71,7 @@ function __sdkman_determine_outdated_version {
     fi
 
     # Resolve remote default version
-    remote_default_version="$(__sdkman_secure_curl "${SDKMAN_SERVICE}/candidates/${candidate}/default")"
+    remote_default_version="$(__sdkman_secure_curl "${SDKMAN_LEGACY_API}/candidates/${candidate}/default")"
     if [ -z "$remote_default_version" ]; then
         return 2
     fi
diff --git a/src/main/bash/sdkman-selfupdate.sh b/src/main/bash/sdkman-selfupdate.sh
index 15c4a112..120b3df0 100644
--- a/src/main/bash/sdkman-selfupdate.sh
+++ b/src/main/bash/sdkman-selfupdate.sh
@@ -27,7 +27,7 @@ function __sdk_selfupdate {
 		echo "No update available at this time."
 
 	else
-		__sdkman_secure_curl "${SDKMAN_SERVICE}/selfupdate" | bash
+		__sdkman_secure_curl "${SDKMAN_LEGACY_API}/selfupdate" | bash
 	fi
 	unset SDKMAN_FORCE_SELFUPDATE
 }
diff --git a/src/test/groovy/sdkman/env/SdkmanBashEnvBuilder.groovy b/src/test/groovy/sdkman/env/SdkmanBashEnvBuilder.groovy
index d929a5f3..1627dbfe 100644
--- a/src/test/groovy/sdkman/env/SdkmanBashEnvBuilder.groovy
+++ b/src/test/groovy/sdkman/env/SdkmanBashEnvBuilder.groovy
@@ -120,8 +120,8 @@ class SdkmanBashEnvBuilder {
                 SDKMAN_DIR: sdkmanDir.absolutePath,
                 SDKMAN_CANDIDATES_DIR: sdkmanCandidatesDir.absolutePath,
                 SDKMAN_OFFLINE_MODE: "$offlineMode",
-                SDKMAN_SERVICE: legacyService,
-                SDKMAN_CURRENT_SERVICE: currentService,
+                SDKMAN_LEGACY_API: legacyService,
+                SDKMAN_CURRENT_API: currentService,
                 SDKMAN_VERSION: sdkmanVersion,
                 JAVA_HOME: jdkHome
         ]