diff --git a/test/scenario/network/network_emulation_manager.cc b/test/scenario/network/network_emulation_manager.cc
index 4f689c0af9..1efc5b4682 100644
--- a/test/scenario/network/network_emulation_manager.cc
+++ b/test/scenario/network/network_emulation_manager.cc
@@ -198,9 +198,9 @@ NetworkEmulationManagerImpl::CreatePulsedPeaksCrossTraffic(
 EmulatedNetworkManagerInterface*
 NetworkEmulationManagerImpl::CreateEmulatedNetworkManagerInterface(
     const std::vector<EmulatedEndpoint*>& endpoints) {
-  auto endpoints_controller = absl::make_unique<EndpointsContainer>(endpoints);
+  auto endpoints_container = absl::make_unique<EndpointsContainer>(endpoints);
   auto network_manager = absl::make_unique<EmulatedNetworkManager>(
-      clock_, endpoints_controller.get());
+      clock_, endpoints_container.get());
   for (auto* endpoint : endpoints) {
     // Associate endpoint with network manager.
     bool insertion_result =
@@ -213,7 +213,7 @@ NetworkEmulationManagerImpl::CreateEmulatedNetworkManagerInterface(
 
   EmulatedNetworkManagerInterface* out = network_manager.get();
 
-  endpoints_controllers_.push_back(std::move(endpoints_controller));
+  endpoints_containers_.push_back(std::move(endpoints_container));
   network_managers_.push_back(std::move(network_manager));
   return out;
 }
diff --git a/test/scenario/network/network_emulation_manager.h b/test/scenario/network/network_emulation_manager.h
index 6fe24f758d..4356152abe 100644
--- a/test/scenario/network/network_emulation_manager.h
+++ b/test/scenario/network/network_emulation_manager.h
@@ -85,7 +85,7 @@ class NetworkEmulationManagerImpl : public NetworkEmulationManager {
   std::vector<std::unique_ptr<TrafficRoute>> traffic_routes_;
   std::vector<std::unique_ptr<RandomWalkCrossTraffic>> random_cross_traffics_;
   std::vector<std::unique_ptr<PulsedPeaksCrossTraffic>> pulsed_cross_traffics_;
-  std::vector<std::unique_ptr<EndpointsContainer>> endpoints_controllers_;
+  std::vector<std::unique_ptr<EndpointsContainer>> endpoints_containers_;
   std::vector<std::unique_ptr<EmulatedNetworkManager>> network_managers_;
 
   std::map<EmulatedEndpoint*, EmulatedNetworkManager*>