2 files changed, 12 insertions, 11 deletions
diff --git a/source/slang/CMakeLists.txt b/source/slang/CMakeLists.txt
index 27019f41a..fd20bbe22 100644
--- a/source/slang/CMakeLists.txt
+++ b/source/slang/CMakeLists.txt
@@ -161,6 +161,11 @@ set(SLANG_LOOKUP_GENERATOR_OUTPUT_DIR
 set(SLANG_LOOKUP_GENERATED_SOURCE
     "${SLANG_LOOKUP_GENERATOR_OUTPUT_DIR}/slang-lookup-GLSLstd450.cpp"
 )
+set(SLANG_RECORD_REPLAY_SYSTEM
+    "${slang_SOURCE_DIR}/source/slang-record-replay/record"
+    "${slang_SOURCE_DIR}/source/slang-record-replay/util"
+)
+
 add_custom_command(
     OUTPUT ${SLANG_LOOKUP_GENERATED_SOURCE}
     COMMAND
@@ -201,10 +206,6 @@ slang_add_target(
     FOLDER generated
 )
 
-set(SLANG_CAPTURE_REPLAY_SYSTEM
-    "${slang_SOURCE_DIR}/source/slang-capture-replay"
-)
-
 #
 # Generate an embeddable stdlib
 #
@@ -243,7 +244,7 @@ configure_file(${slang_SOURCE_DIR}/slang-tag-version.h.in slang-version-header/s
 #
 
 set(slang_common_args
-    EXTRA_SOURCE_DIRS ${SLANG_CAPTURE_REPLAY_SYSTEM}
+    EXTRA_SOURCE_DIRS ${SLANG_RECORD_REPLAY_SYSTEM}
     USE_EXTRA_WARNINGS
     LINK_WITH_PRIVATE
         core
diff --git a/source/slang/slang-api.cpp b/source/slang/slang-api.cpp
index 250b9edf3..c4f668fb2 100644
--- a/source/slang/slang-api.cpp
+++ b/source/slang/slang-api.cpp
@@ -5,8 +5,8 @@
 #include "slang-repro.h"
 
 #include "../core/slang-shared-library.h"
-#include "../slang-capture-replay/slang-global-session.h"
-#include "../slang-capture-replay/capture_utility.h"
+#include "../slang-record-replay/record/slang-global-session.h"
+#include "../slang-record-replay/util/record-utility.h"
 
 // implementation of C interface
 
@@ -119,11 +119,11 @@ SLANG_API SlangResult slang_createGlobalSession(
     }
 
     // Check if the SLANG_CAPTURE_ENABLE_ENV is enabled
-    if (SlangCapture::isCaptureLayerEnabled())
+    if (SlangRecord::isRecordLayerEnabled())
     {
-        SlangCapture::GlobalSessionCapture* globalSessionCapture =
-            new SlangCapture::GlobalSessionCapture(globalSession.detach());
-        Slang::ComPtr<SlangCapture::GlobalSessionCapture> result(globalSessionCapture);
+        SlangRecord::GlobalSessionRecorder* globalSessionRecorder =
+            new SlangRecord::GlobalSessionRecorder(globalSession.detach());
+        Slang::ComPtr<SlangRecord::GlobalSessionRecorder> result(globalSessionRecorder);
         *outGlobalSession = result.detach();
     }
     else