diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/Loader.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/Loader.java
index b3e33981db..e9509f4218 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/Loader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/Loader.java
@@ -448,9 +448,9 @@ public final class Loader implements LoaderErrorThrower {
           obtainMessage(MSG_IO_EXCEPTION, new UnexpectedLoaderException(e)).sendToTarget();
         }
       } catch (Error e) {
-        // We'd hope that the platform would kill the process if an Error is thrown here, but the
-        // executor may catch the error (b/20616433). Throw it here, but also pass and throw it from
-        // the handler thread so that the process dies even if the executor behaves in this way.
+        // We'd hope that the platform would shut down the process if an Error is thrown here, but
+        // the executor may catch the error (b/20616433). Throw it here, but also pass and throw it
+        // from the handler thread so the process dies even if the executor behaves in this way.
         Log.e(TAG, "Unexpected error loading stream", e);
         if (!released) {
           obtainMessage(MSG_FATAL_ERROR, e).sendToTarget();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
index 9f4fcd4c11..ce69d5a46c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
@@ -82,7 +82,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
    *
    * <p>[1] (key1, id1) is removed from the in-memory index ... the index is not stored to disk ...
    * [2] id1 is reused for a different key2 ... the index is not stored to disk ... [3] A file for
-   * key2 is partially written using a path corresponding to id1 ... the process is killed before
+   * key2 is partially written using a path corresponding to id1 ... the process is shut down before
    * the index is stored to disk ... [4] The index is read from disk, causing the partially written
    * file to be incorrectly associated to key1
    *