diff --git a/src/tests/BUILD.gn b/src/tests/BUILD.gn
index 0005f4a76..5d9cda77d 100644
--- a/src/tests/BUILD.gn
+++ b/src/tests/BUILD.gn
@@ -281,7 +281,7 @@ test("gpgmm_capture_replay_tests") {
     sources += [
       "D3D12Test.cpp",
       "D3D12Test.h",
-      "capture_replay_tests/D3D12EventTraceReplay.cpp",
+      "capture_replay_tests/D3D12MemoryTraceReplay.cpp",
     ]
   }
 
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index da66a3142..52579730f 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -127,7 +127,7 @@ if (GPGMM_ENABLE_D3D12)
   target_sources(gpgmm_capture_replay_tests PRIVATE
       "D3D12Test.cpp"
       "D3D12Test.h"
-      "capture_replay_tests/D3D12EventTraceReplay.cpp"
+      "capture_replay_tests/D3D12MemoryTraceReplay.cpp"
   )
 
   target_link_libraries(gpgmm_capture_replay_tests PRIVATE
diff --git a/src/tests/capture_replay_tests/D3D12EventTraceReplay.cpp b/src/tests/capture_replay_tests/D3D12MemoryTraceReplay.cpp
similarity index 98%
rename from src/tests/capture_replay_tests/D3D12EventTraceReplay.cpp
rename to src/tests/capture_replay_tests/D3D12MemoryTraceReplay.cpp
index e267e0471..3074e0bdd 100644
--- a/src/tests/capture_replay_tests/D3D12EventTraceReplay.cpp
+++ b/src/tests/capture_replay_tests/D3D12MemoryTraceReplay.cpp
@@ -144,7 +144,7 @@ namespace {
 
 }  // namespace
 
-class D3D12EventTraceReplay : public D3D12TestBase, public CaptureReplayTestWithParams {
+class D3D12MemoryTraceReplay : public D3D12TestBase, public CaptureReplayTestWithParams {
   protected:
     void SetUp() override {
         D3D12TestBase::SetUp();
@@ -619,14 +619,14 @@ class D3D12EventTraceReplay : public D3D12TestBase, public CaptureReplayTestWith
 };
 
 // Playback the captured trace as-is.
-TEST_P(D3D12EventTraceReplay, Replay) {
+TEST_P(D3D12MemoryTraceReplay, Replay) {
     TestEnviromentParams forceParams = {};
 
     RunSingleTest(forceParams);
 }
 
 // Verify that playback of a captured trace does not exceed peak usage.
-TEST_P(D3D12EventTraceReplay, PeakUsage) {
+TEST_P(D3D12MemoryTraceReplay, PeakUsage) {
     TestEnviromentParams forceParams = {};
     RunSingleTest(forceParams);
 
@@ -634,7 +634,7 @@ TEST_P(D3D12EventTraceReplay, PeakUsage) {
 }
 
 // Verify that playback with pre-fetching enabled will succeed.
-TEST_P(D3D12EventTraceReplay, AllowPrefetch) {
+TEST_P(D3D12MemoryTraceReplay, AllowPrefetch) {
     TestEnviromentParams forceParams = {};
     forceParams.IsPrefetchAllowed = true;
 
@@ -642,7 +642,7 @@ TEST_P(D3D12EventTraceReplay, AllowPrefetch) {
 }
 
 // Verify no heap re-use through sub-allocation will succeed.
-TEST_P(D3D12EventTraceReplay, DisableSuballocation) {
+TEST_P(D3D12MemoryTraceReplay, DisableSuballocation) {
     TestEnviromentParams forceParams = {};
     forceParams.IsSuballocationDisabled = true;
 
@@ -652,7 +652,7 @@ TEST_P(D3D12EventTraceReplay, DisableSuballocation) {
 }
 
 // Verify that playback no memory created will succeed.
-TEST_P(D3D12EventTraceReplay, NeverAllocate) {
+TEST_P(D3D12MemoryTraceReplay, NeverAllocate) {
     TestEnviromentParams forceParams = {};
     forceParams.IsNeverAllocate = true;
 
@@ -661,4 +661,4 @@ TEST_P(D3D12EventTraceReplay, NeverAllocate) {
     EXPECT_LE(mReplayedMemoryStats.PeakUsage, 0u);
 }
 
-GPGMM_INSTANTIATE_CAPTURE_REPLAY_TEST(D3D12EventTraceReplay);
+GPGMM_INSTANTIATE_CAPTURE_REPLAY_TEST(D3D12MemoryTraceReplay);