diff --git a/.github/actions/docker-build-and-push-tools/action.yaml b/.github/actions/docker-build-and-push-tools/action.yaml
index 9c7e505613c..134e0174967 100644
--- a/.github/actions/docker-build-and-push-tools/action.yaml
+++ b/.github/actions/docker-build-and-push-tools/action.yaml
@@ -78,16 +78,16 @@ runs:
         flavor: |
           latest=false
 
-    - name: Docker meta for autoware:simulator
-      id: meta-simulator
+    - name: Docker meta for autoware:scenario-simulator
+      id: meta-scenario-simulator
       uses: docker/metadata-action@v5
       with:
         images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }}
         tags: |
-          type=raw,value=simulator-${{ inputs.platform }}
-          type=raw,value=simulator-${{ steps.date.outputs.date }}-${{ inputs.platform }}
-          type=ref,event=tag,prefix=simulator-,suffix=-${{ inputs.platform }}
-        bake-target: docker-metadata-action-simulator
+          type=raw,value=scenario-simulator-${{ inputs.platform }}
+          type=raw,value=scenario-simulator-${{ steps.date.outputs.date }}-${{ inputs.platform }}
+          type=ref,event=tag,prefix=scenario-simulator-,suffix=-${{ inputs.platform }}
+        bake-target: docker-metadata-action-scenario-simulator
         flavor: |
           latest=false
 
@@ -104,7 +104,7 @@ runs:
         push: true
         files: |
           docker/docker-bake-tools.hcl
-          ${{ steps.meta-simulator.outputs.bake-file }}
+          ${{ steps.meta-scenario-simulator.outputs.bake-file }}
           ${{ steps.meta-visualizer.outputs.bake-file }}
         provenance: false
         set: |
diff --git a/docker/docker-bake-tools.hcl b/docker/docker-bake-tools.hcl
index cb6af086fe7..e0d086c1e2f 100644
--- a/docker/docker-bake-tools.hcl
+++ b/docker/docker-bake-tools.hcl
@@ -1,18 +1,18 @@
 group "default" {
   targets = [
-    "simulator",
+    "scenario-simulator",
     "visualizer"
   ]
 }
 
 // For docker/metadata-action
-target "docker-metadata-action-simulator" {}
+target "docker-metadata-action-scenario-simulator" {}
 target "docker-metadata-action-visualizer" {}
 
-target "simulator" {
-  inherits = ["docker-metadata-action-simulator"]
-  dockerfile = "docker/tools/Dockerfile.simulator"
-  target = "simulator"
+target "scenario-simulator" {
+  inherits = ["docker-metadata-action-scenario-simulator"]
+  dockerfile = "docker/tools/Dockerfile.scenario-simulator"
+  target = "scenario-simulator"
 }
 
 target "visualizer" {
diff --git a/docker/tools/run.sh b/docker/tools/run.sh
index 555cb5815a3..f8aff78db70 100755
--- a/docker/tools/run.sh
+++ b/docker/tools/run.sh
@@ -11,5 +11,5 @@
 docker run -it --rm \
     --net=host \
     --platform linux/amd64 \
-    --name simulator \
-    ghcr.io/autowarefoundation/autoware:simulator-20250130-amd64
+    --name scenario-simulator \
+    ghcr.io/autowarefoundation/autoware:scenario-simulator-20250130-amd64
diff --git a/docker/tools/scenario-simulator/Dockerfile.simulator b/docker/tools/scenario-simulator/Dockerfile.simulator
index 128accd7a80..933ec206dd8 100644
--- a/docker/tools/scenario-simulator/Dockerfile.simulator
+++ b/docker/tools/scenario-simulator/Dockerfile.simulator
@@ -10,7 +10,7 @@ COPY src /autoware/src
 COPY docker/scripts/resolve_rosdep_keys.sh /autoware/resolve_rosdep_keys.sh
 RUN chmod +x /autoware/resolve_rosdep_keys.sh
 
-# Install dependencies and build the simulator
+# Install dependencies and build the scenario simulator
 # hadolint ignore=SC1091
 RUN --mount=type=ssh \
     --mount=type=cache,target=/var/cache/apt,sharing=locked \
@@ -36,7 +36,7 @@ RUN /autoware/resolve_rosdep_keys.sh /autoware/src/simulator ${ROS_DISTRO} \
 
 ### Simulator
 # TODO: Remove architecture specific image after arm64 builds are FIXED
-FROM ghcr.io/autowarefoundation/autoware:universe-visualization-amd64 AS simulator
+FROM ghcr.io/autowarefoundation/autoware:universe-visualization-amd64 AS scenario-simulator
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 ARG ROS_DISTRO
 ARG LIB_DIR
diff --git a/docker/tools/scenario-simulator/entrypoint.sh b/docker/tools/scenario-simulator/entrypoint.sh
index cf2fb9c2890..55cde243f69 100644
--- a/docker/tools/scenario-simulator/entrypoint.sh
+++ b/docker/tools/scenario-simulator/entrypoint.sh
@@ -52,7 +52,7 @@ run_scenario_simulator() {
 source "/opt/ros/$ROS_DISTRO/setup.bash"
 source "/opt/autoware/setup.bash"
 
-# Execute passed command if provided, otherwise run simulator
+# Execute passed command if provided, otherwise run scenario simulator
 if [ $# -eq 0 ]; then
     run_scenario_simulator
 else