diff --git a/test/common/common/scope_tracker_test.cc b/test/common/common/scope_tracker_test.cc
index 1c5451660f049..ee53c88a537ce 100644
--- a/test/common/common/scope_tracker_test.cc
+++ b/test/common/common/scope_tracker_test.cc
@@ -18,7 +18,7 @@ using testing::_;
 TEST(ScopeTrackerScopeStateTest, ShouldManageTrackedObjectOnDispatcherStack) {
   Api::ApiPtr api(Api::createApiForTest());
   Event::DispatcherPtr dispatcher(api->allocateDispatcher("test_thread"));
-  MockScopedTrackedObject tracked_object;
+  MockScopeTrackedObject tracked_object;
   {
     ScopeTrackerScopeState scope(&tracked_object, *dispatcher);
     // Check that the tracked_object is on the tracked object stack
diff --git a/test/common/event/dispatcher_impl_test.cc b/test/common/event/dispatcher_impl_test.cc
index fab86c343f1bf..9525ed6ad61c1 100644
--- a/test/common/event/dispatcher_impl_test.cc
+++ b/test/common/event/dispatcher_impl_test.cc
@@ -593,7 +593,7 @@ TEST_F(DispatcherImplTest, Timer) {
 
 TEST_F(DispatcherImplTest, TimerWithScope) {
   TimerPtr timer;
-  MockScopedTrackedObject scope;
+  MockScopeTrackedObject scope;
   dispatcher_->post([this, &timer, &scope]() {
     {
       // Expect a call to dumpState. The timer will call onFatalError during
diff --git a/test/common/event/scaled_range_timer_manager_impl_test.cc b/test/common/event/scaled_range_timer_manager_impl_test.cc
index 90ad37070a86f..ca89c39fbd971 100644
--- a/test/common/event/scaled_range_timer_manager_impl_test.cc
+++ b/test/common/event/scaled_range_timer_manager_impl_test.cc
@@ -299,7 +299,7 @@ class ScaledRangeTimerManagerTestWithScope : public ScaledRangeTimerManagerTest,
                                              public testing::WithParamInterface<bool> {
 public:
   ScopeTrackedObject* getScope() { return GetParam() ? &scope_ : nullptr; }
-  MockScopedTrackedObject scope_;
+  MockScopeTrackedObject scope_;
 };
 
 TEST_P(ScaledRangeTimerManagerTestWithScope, ReRegisterOnCallback) {
diff --git a/test/mocks/common.h b/test/mocks/common.h
index e4a4b37f67564..8cd79da8c53d7 100644
--- a/test/mocks/common.h
+++ b/test/mocks/common.h
@@ -88,7 +88,7 @@ inline bool operator==(const StringViewSaver& saver, const char* str) {
   return saver.value() == str;
 }
 
-class MockScopedTrackedObject : public ScopeTrackedObject {
+class MockScopeTrackedObject : public ScopeTrackedObject {
 public:
   MOCK_METHOD(void, dumpState, (std::ostream&, int), (const));
 };
diff --git a/test/mocks/http/mocks.h b/test/mocks/http/mocks.h
index ec2216287b175..3a770de91b5e2 100644
--- a/test/mocks/http/mocks.h
+++ b/test/mocks/http/mocks.h
@@ -275,7 +275,7 @@ class MockStreamDecoderFilterCallbacks : public StreamDecoderFilterCallbacks,
   std::list<DownstreamWatermarkCallbacks*> callbacks_{};
   testing::NiceMock<Tracing::MockSpan> active_span_;
   testing::NiceMock<Tracing::MockConfig> tracing_config_;
-  testing::NiceMock<MockScopedTrackedObject> scope_;
+  testing::NiceMock<MockScopeTrackedObject> scope_;
   bool is_grpc_request_{};
   bool is_head_request_{false};
   bool stream_destroyed_{};
@@ -327,7 +327,7 @@ class MockStreamEncoderFilterCallbacks : public StreamEncoderFilterCallbacks,
   Buffer::InstancePtr buffer_;
   testing::NiceMock<Tracing::MockSpan> active_span_;
   testing::NiceMock<Tracing::MockConfig> tracing_config_;
-  testing::NiceMock<MockScopedTrackedObject> scope_;
+  testing::NiceMock<MockScopeTrackedObject> scope_;
 };
 
 class MockStreamDecoderFilter : public StreamDecoderFilter {