diff --git a/.github/workflows/e2e-ci.yml b/.github/workflows/e2e-ci.yml
index 7f42e609..1fabd772 100644
--- a/.github/workflows/e2e-ci.yml
+++ b/.github/workflows/e2e-ci.yml
@@ -24,7 +24,7 @@ concurrency:
 
 env:
   CARGO_TERM_COLOR: always
-  CHARIOTT_REGISTRY_TTL_SECS: 7
+  INTENT_BROKERING_REGISTRY_TTL_SECS: 7
 
 jobs:
   e2e:
@@ -67,7 +67,7 @@ jobs:
         run: |
           docker run -d --name intent_brokering --network host \
             -e RUST_LOG=debug \
-            -e CHARIOTT_REGISTRY_TTL_SECS \
+            -e INTENT_BROKERING_REGISTRY_TTL_SECS \
             intent_brokering:1
 
       - name: Start KV-App
diff --git a/Dockerfile.intent_brokering b/Dockerfile.intent_brokering
index 5788d2a3..3e7bcf9a 100644
--- a/Dockerfile.intent_brokering
+++ b/Dockerfile.intent_brokering
@@ -8,7 +8,7 @@ FROM docker.io/library/rust:${RUST_VERSION} AS builder
 # Dockerfile for building Eclipse Chariott Intent Brokering runtime container
 #
 # This Dockerfile utilizes a two step build process. It builds Intent Brokering
-# service with statically linked dependencies (using musl) for a x86_64 
+# service with statically linked dependencies (using musl) for a x86_64
 # architecture.
 
 # Chariott user id
diff --git a/intent_brokering/examples/applications/Dockerfile.lt-provider-app.ci b/intent_brokering/examples/applications/Dockerfile.lt-provider-app.ci
index 142012e2..a9230e79 100644
--- a/intent_brokering/examples/applications/Dockerfile.lt-provider-app.ci
+++ b/intent_brokering/examples/applications/Dockerfile.lt-provider-app.ci
@@ -5,9 +5,9 @@
 ARG RUST_VERSION=1.70
 FROM docker.io/library/rust:${RUST_VERSION} AS builder
 
-# Dockerfile for building the "latency test" container
+# Dockerfile for building the "load test" container
 #
-# This Dockerfile utilizes a two step build process. It builds "latency test"
+# This Dockerfile utilizes a two step build process. It builds "load test"
 # with statically linked dependencies (using musl vs. glibc to accomplish this)
 # for a specific architecture such that we can utilize a scratch container
 # without further dependencies for our final container, minimizing container
@@ -30,7 +30,7 @@ RUN rustup target add x86_64-unknown-linux-musl
 
 RUN cargo build --release --target=x86_64-unknown-linux-musl --package lt-provider-app
 
-# unprivileged identity to run "latency test" as
+# unprivileged identity to run "load test" as
 RUN adduser \
     --disabled-password \
     --gecos "" \
@@ -46,7 +46,7 @@ RUN adduser \
 FROM alpine:latest
 ARG APP_NAME
 ARG USER_NAME
-# Import "latency test" user and group from builder.
+# Import "load test" user and group from builder.
 COPY --from=builder /etc/passwd /etc/passwd
 COPY --from=builder /etc/group /etc/group
 
@@ -55,6 +55,6 @@ WORKDIR /sdv
 # Copy our build
 COPY --from=builder /sdv/target/x86_64-unknown-linux-musl/release/lt-provider-app /sdv/lt-provider-app
 
-# Use the unprivileged "latency test" user during execution.
+# Use the unprivileged "load test" user during execution.
 USER ${USER_NAME}:${USER_NAME}
 CMD ["sh", "-c", "./lt-provider-app"]
diff --git a/intent_brokering/tests/README.md b/intent_brokering/tests/README.md
index a62197ef..631b3d5f 100644
--- a/intent_brokering/tests/README.md
+++ b/intent_brokering/tests/README.md
@@ -11,9 +11,9 @@ Assuming the current working directory is the project root, run:
 
 ```sh
 cargo build --release -p intent_brokering -p kv-app
-CHARIOTT_REGISTRY_TTL_SECS=7 ./target/release/chariott &
+INTENT_BROKERING_REGISTRY_TTL_SECS=7 ./target/release/chariott &
 ./target/release/kv-app &
-CHARIOTT_REGISTRY_TTL_SECS=7 cargo test --test '*e2e'
+INTENT_BROKERING_REGISTRY_TTL_SECS=7 cargo test --test '*e2e'
 ```
 
 If you want to display debug logs, make sure to set the log level via the `RUST_LOG` environment variable.