diff --git a/tools/art b/tools/art
index ece4fc3..e08a79f 100644
--- a/tools/art
+++ b/tools/art
@@ -432,18 +432,18 @@
   # This script is used on host and target (device). However, the (expected)
   # default value `ANDROID_RUNTIME_ROOT` is not the same on host and target:
   # - on host, `ANDROID_RUNTIME_ROOT` is expected to be
-  #   "$ANDROID_ROOT/com.android.runtime";
+  #   "$ANDROID_ROOT/com.android.art";
   # - on target, `ANDROID_RUNTIME_ROOT` is expected to be
-  #   "/apex/com.android.runtime".
+  #   "/apex/com.android.art".
   #
   # We use the presence/absence of the `$ANDROID_ROOT/../apex` directory to
   # determine whether we are on target or host (this is brittle, but simple).
   if [ -d "$ANDROID_ROOT/../apex" ]; then
     # Target case.
-    ANDROID_RUNTIME_ROOT="/apex/com.android.runtime"
+    ANDROID_RUNTIME_ROOT="/apex/com.android.art"
   else
     # Host case.
-    ANDROID_RUNTIME_ROOT="$ANDROID_ROOT/com.android.runtime"
+    ANDROID_RUNTIME_ROOT="$ANDROID_ROOT/com.android.art"
   fi
 fi
 
diff --git a/tools/common/common.py b/tools/common/common.py
index c80ebf5..93b014a 100755
--- a/tools/common/common.py
+++ b/tools/common/common.py
@@ -300,7 +300,7 @@
     lib = 'lib64' if x64 else 'lib'
     android_root = GetEnvVariableOrError('ANDROID_HOST_OUT')
     android_i18n_root = android_root + '/com.android.i18n'
-    android_runtime_root = android_root + '/com.android.runtime'
+    android_runtime_root = android_root + '/com.android.art'
     android_tzdata_root = android_root + '/com.android.tzdata'
     library_path = android_root + '/' + lib
     path = android_root + '/bin'
diff --git a/tools/host_bcp.sh b/tools/host_bcp.sh
index bb12a02..1dea295 100755
--- a/tools/host_bcp.sh
+++ b/tools/host_bcp.sh
@@ -22,7 +22,7 @@
   --runtime-arg -Xbootclasspath:...
   --runtime-arg -Xbootclasspath-locations:...
 arguments for many ART host tools based on the \$ANDROID_PRODUCT_OUT variable
-and existing \$ANDROID_PRODUCT_OUT/apex/com.android.runtime* paths.
+and existing \$ANDROID_PRODUCT_OUT/apex/com.android.art* paths.
 If --use-first-dir is specified, the script will use the first apex dir instead
 of resulting in an error.
 EOF
@@ -51,20 +51,20 @@
 fi
 
 MANIFEST=/apex_manifest.json
-RUNTIME_APEX=/apex/com.android.runtime
-RUNTIME_APEX_SELECTED=
-for m in `ls -1 -d ${ANDROID_PRODUCT_OUT}{,/system}${RUNTIME_APEX}*${MANIFEST} 2>/dev/null`; do
+ART_APEX=/apex/com.android.art
+ART_APEX_SELECTED=
+for m in `ls -1 -d ${ANDROID_PRODUCT_OUT}{,/system}${ART_APEX}*${MANIFEST} 2>/dev/null`; do
   d=${m:0:-${#MANIFEST}}
-  if [[ "x${RUNTIME_APEX_SELECTED}" != "x" ]]; then
+  if [[ "x${ART_APEX_SELECTED}" != "x" ]]; then
     if [[ $USE_FIRST_DIR == true ]]; then
       break
     fi
-    echo "Multiple Runtime apex dirs: ${RUNTIME_APEX_SELECTED}, ${d}."
+    echo "Multiple Runtime apex dirs: ${ART_APEX_SELECTED}, ${d}."
     exit 1
   fi
-  RUNTIME_APEX_SELECTED=${d}
+  ART_APEX_SELECTED=${d}
 done
-if [[ "x${RUNTIME_APEX_SELECTED}" == "x" ]]; then
+if [[ "x${ART_APEX_SELECTED}" == "x" ]]; then
   echo "No Runtime apex dir."
   exit 1
 fi
@@ -75,9 +75,9 @@
 for COMPONENT in ${BCPL}; do
   HEAD=${ANDROID_PRODUCT_OUT}
   TAIL=${COMPONENT}
-  if [[ ${COMPONENT:0:${#RUNTIME_APEX}} = ${RUNTIME_APEX} ]]; then
-    HEAD=${RUNTIME_APEX_SELECTED}
-    TAIL=${COMPONENT:${#RUNTIME_APEX}}
+  if [[ ${COMPONENT:0:${#ART_APEX}} = ${ART_APEX} ]]; then
+    HEAD=${ART_APEX_SELECTED}
+    TAIL=${COMPONENT:${#ART_APEX}}
   fi
   if [[ ! -e $HEAD$TAIL ]]; then
     echo "File does not exist: $HEAD$TAIL"