diff --git a/Tethering/apishim/31/com/android/networkstack/tethering/apishim/api31/BpfCoordinatorShimImpl.java b/Tethering/apishim/31/com/android/networkstack/tethering/apishim/api31/BpfCoordinatorShimImpl.java
index 3e46f9865c..2bdddc11b3 100644
--- a/Tethering/apishim/31/com/android/networkstack/tethering/apishim/api31/BpfCoordinatorShimImpl.java
+++ b/Tethering/apishim/31/com/android/networkstack/tethering/apishim/api31/BpfCoordinatorShimImpl.java
@@ -62,7 +62,7 @@ public class BpfCoordinatorShimImpl
     @Nullable
     private final BpfMap<Tether4Key, Tether4Value> mBpfDownstream4Map;
 
-    // BPF map for downstream IPv4 forwarding.
+    // BPF map for upstream IPv4 forwarding.
     @Nullable
     private final BpfMap<Tether4Key, Tether4Value> mBpfUpstream4Map;
 
diff --git a/Tethering/src/com/android/networkstack/tethering/Tether4Key.java b/Tethering/src/com/android/networkstack/tethering/Tether4Key.java
index 58415caef8..a01ea34c68 100644
--- a/Tethering/src/com/android/networkstack/tethering/Tether4Key.java
+++ b/Tethering/src/com/android/networkstack/tethering/Tether4Key.java
@@ -28,7 +28,7 @@ import java.net.Inet4Address;
 import java.net.UnknownHostException;
 import java.util.Objects;
 
-/** Key type for upstream IPv4 forwarding map. */
+/** Key type for downstream & upstream IPv4 forwarding maps. */
 public class Tether4Key extends Struct {
     @Field(order = 0, type = Type.U32)
     public final long iif;
diff --git a/Tethering/src/com/android/networkstack/tethering/Tether4Value.java b/Tethering/src/com/android/networkstack/tethering/Tether4Value.java
index 8084c05ea8..03a226ce45 100644
--- a/Tethering/src/com/android/networkstack/tethering/Tether4Value.java
+++ b/Tethering/src/com/android/networkstack/tethering/Tether4Value.java
@@ -28,7 +28,7 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Objects;
 
-/** Value type for upstream IPv4 forwarding map. */
+/** Value type for downstream & upstream IPv4 forwarding maps. */
 public class Tether4Value extends Struct {
     @Field(order = 0, type = Type.U32)
     public final long oif;