diff --git a/USAGE_desktop_D3D12.md b/USAGE_desktop_D3D12.md
index 3860592951..0c32c7ca36 100644
--- a/USAGE_desktop_D3D12.md
+++ b/USAGE_desktop_D3D12.md
@@ -110,7 +110,7 @@ Quit after capturing frame ranges | GFXRECON_QUIT_AFTER_CAPTURE_FRAMES | BOOL |
 Hotkey Capture Trigger | GFXRECON_CAPTURE_TRIGGER | STRING | Specify a hotkey (any one of F1-F12, TAB, CONTROL) that will be used to start/stop capture.  Example: `F3` will set the capture trigger to F3 hotkey. One capture file will be generated for each pair of start/stop hotkey presses. Default is: Empty string (hotkey capture trigger is disabled).
 Hotkey Capture Trigger Frames | GFXRECON_CAPTURE_TRIGGER_FRAMES | STRING | Specify a limit on the number of frames to be captured via hotkey.  Example: `1` will capture exactly one frame when the trigger key is pressed. Default is: Empty string (no limit)
 Capture Specific GPU Queue Submits | GFXRECON_CAPTURE_QUEUE_SUBMITS | STRING | Specify one or more comma-separated GPU queue submit call ranges to capture.  Queue submit calls are `vkQueueSubmit` for Vulkan and `ID3D12CommandQueue::ExecuteCommandLists` for DX12. Queue submit ranges work as described above in `GFXRECON_CAPTURE_FRAMES` but on GPU queue submit calls instead of frames.  Default is: Empty string (all queue submits are captured).
-Capture Specific Drawcalls | GFXRECON_CAPTURE_DRAWCALLS | STRING | Specify one index or a range indices drawacalls(include dispatch) based on a ExecuteCommandList index and a CommandList index to capture. The index is 0-based. The args are one submit index, one command index, one or a range indices of draw calls, one or a range indices of bundle drawcalls(option), like "0,0,0" or "0,0,0-2" or "0,0,0-2,0". The forth arg is an option for bundle case. If the the 3rd arg is a bundle commandlist, but it doesn't set the 4th arg, it will set 0 as default. Default is: Empty string (all drawcalls are captured).
+Capture Specific Draw Calls | GFXRECON_CAPTURE_DRAW_CALLS | STRING | Specify one index or a range indices drawacalls(include dispatch) based on a ExecuteCommandList index and a CommandList index to capture. The index is 0-based. The args are one submit index, one command index, one or a range indices of draw calls, one or a range indices of bundle draw calls(option), like "0,0,0" or "0,0,0-2" or "0,0,0-2,0". The forth arg is an option for bundle case. If the the 3rd arg is a bundle commandlist, but it doesn't set the 4th arg, it will set 0 as default. Default is: Empty string (all draw calls are captured).
 Capture File Compression Type | GFXRECON_CAPTURE_COMPRESSION_TYPE | STRING | Compression format to use with the capture file.  Valid values are: `LZ4`, `ZLIB`, `ZSTD`, and `NONE`. Default is: `LZ4`
 Capture File Timestamp | GFXRECON_CAPTURE_FILE_TIMESTAMP | BOOL | Add a timestamp to the capture file as described by [Timestamps](#timestamps).  Default is: `true`
 Capture File Flush After Write | GFXRECON_CAPTURE_FILE_FLUSH | BOOL | Flush output stream after each packet is written to the capture file.  Default is: `false`
@@ -212,7 +212,7 @@ Usage:
                         [--fwo <x,y> | --force-windowed-origin <x,y>]
                         [--log-level <level>] [--log-file <file>] [--log-debugview]
                         [--batching-memory-usage <pct>]
-                        [--dump-resources <submit-index,command-index,drawcall-index>] <file>
+                        [--dump-resources <submit-index,command-index,draw-call-index>] <file>
                         [--pbi-all] [--pbis <index1,index2>]
 
 Required arguments:
@@ -339,12 +339,12 @@ D3D12-only:
                                for batching and does not guarantee overall max memory usage.
                                Acceptable values range from 0 to 100 (default: 80). 0 means no batching,
                                100 means use all available system and GPU memory.
-  --dump-resources <submit-index,command-index,drawcall-index>
-                                Output binaray resources for a specific drawcall.
+  --dump-resources <submit-index,command-index,draw-call-index>
+                                Output binaray resources for a specific draw call.
                                 Include vertex, index, const buffer, shader resource, render target,
-                                and depth stencil. And for before and after drawcall.
+                                and depth stencil. And for before and after draw call.
                                 Arguments becomes three indices, submit index, command index,
-                                drawcall index. The command index is based on its in ExecuteCommandLists.
+                                draw call index. The command index is based on its in ExecuteCommandLists.
 ```
 
 
diff --git a/framework/decode/dx12_browse_consumer.h b/framework/decode/dx12_browse_consumer.h
index 82f2ea4316..9f5c910d73 100644
--- a/framework/decode/dx12_browse_consumer.h
+++ b/framework/decode/dx12_browse_consumer.h
@@ -47,7 +47,7 @@ struct ExecuteIndirectInfo
     uint64_t         count_offset{ 0 };
 };
 
-struct TrackDumpDrawcall
+struct TrackDumpDrawCall
 {
     DumpResourcesTarget dump_resources_target{};
     format::HandleId    command_list_id{ format::kNullHandleId };
@@ -75,9 +75,9 @@ struct TrackDumpDrawcall
     // Bundle
     format::HandleId bundle_commandlist_id{ format::kNullHandleId };
     // It couldn't use the structure that is the same to the parent structure, so use std::shared_ptr.
-    std::shared_ptr<TrackDumpDrawcall> bundle_target_drawcall;
+    std::shared_ptr<TrackDumpDrawCall> bundle_target_draw_call;
 
-    uint64_t drawcall_block_index{ 0 }; // It could also be ExecuteIndirect or ExecuteBundle block index.
+    uint64_t draw_call_block_index{ 0 }; // It could also be ExecuteIndirect or ExecuteBundle block index.
     uint64_t execute_block_index{ 0 };
 
     void Clear()
@@ -86,7 +86,7 @@ struct TrackDumpDrawcall
         descriptor_heap_ids.clear();
         captured_descriptor_gpu_handles.clear();
         bundle_commandlist_id  = format::kNullHandleId;
-        bundle_target_drawcall = nullptr;
+        bundle_target_draw_call = nullptr;
     }
 };
 
@@ -111,7 +111,7 @@ struct TrackDumpCommandList
     // Track render target info in replay, not here.
     // Because the useful info is replay cpuDescriptor. It's only available in replay.
 
-    std::vector<std::shared_ptr<TrackDumpDrawcall>> track_dump_drawcalls;
+    std::vector<std::shared_ptr<TrackDumpDrawCall>> track_dump_draw_calls;
 
     void Clear()
     {
@@ -122,7 +122,7 @@ struct TrackDumpCommandList
         current_captured_index_buffer_view = {};
         current_descriptor_heap_ids.clear();
         current_captured_descriptor_gpu_handles.clear();
-        track_dump_drawcalls.clear();
+        track_dump_draw_calls.clear();
     }
 };
 
@@ -136,7 +136,7 @@ class Dx12BrowseConsumer : public Dx12Consumer
         dump_resources_target_ = dump_resources_target;
     }
 
-    TrackDumpDrawcall* GetTrackDumpTarget()
+    TrackDumpDrawCall* GetTrackDumpTarget()
     {
         if (track_submit_index_ <= dump_resources_target_.submit_index)
         {
@@ -154,8 +154,8 @@ class Dx12BrowseConsumer : public Dx12Consumer
         auto it = track_commandlist_infos_.find(target_command_list_);
         if (it != track_commandlist_infos_.end())
         {
-            auto drawcall_size = it->second.track_dump_drawcalls.size();
-            GFXRECON_ASSERT(drawcall_size > target_drawcall_index_);
+            auto draw_call_size = it->second.track_dump_draw_calls.size();
+            GFXRECON_ASSERT(draw_call_size > target_draw_call_index_);
 
             if (is_modified_args)
             {
@@ -163,9 +163,9 @@ class Dx12BrowseConsumer : public Dx12Consumer
                                   "the original args.",
                                   dump_resources_target_.submit_index,
                                   dump_resources_target_.command_index,
-                                  dump_resources_target_.drawcall_index);
+                                  dump_resources_target_.draw_call_index);
             }
-            auto& target                  = it->second.track_dump_drawcalls[target_drawcall_index_];
+            auto& target                  = it->second.track_dump_draw_calls[target_draw_call_index_];
             target->dump_resources_target = dump_resources_target_;
             return target.get();
         }
@@ -221,11 +221,11 @@ class Dx12BrowseConsumer : public Dx12Consumer
             auto it = track_commandlist_infos_.find(object_id);
             if (it != track_commandlist_infos_.end())
             {
-                for (auto& drawcall : it->second.track_dump_drawcalls)
+                for (auto& draw_call : it->second.track_dump_draw_calls)
                 {
-                    if (drawcall->begin_renderpass_block_index != 0 && drawcall->end_renderpass_block_index == 0)
+                    if (draw_call->begin_renderpass_block_index != 0 && draw_call->end_renderpass_block_index == 0)
                     {
-                        drawcall->end_renderpass_block_index = call_info.index;
+                        draw_call->end_renderpass_block_index = call_info.index;
                     }
                 }
             }
@@ -387,7 +387,7 @@ class Dx12BrowseConsumer : public Dx12Consumer
                                                                  UINT               StartVertexLocation,
                                                                  UINT               StartInstanceLocation)
     {
-        TrackTargetDrawcall(call_info, object_id, true);
+        TrackTargetDrawCall(call_info, object_id, true);
     }
 
     virtual void Process_ID3D12GraphicsCommandList_DrawIndexedInstanced(const ApiCallInfo& call_info,
@@ -398,7 +398,7 @@ class Dx12BrowseConsumer : public Dx12Consumer
                                                                         INT                BaseVertexLocation,
                                                                         UINT               StartInstanceLocation)
     {
-        TrackTargetDrawcall(call_info, object_id, true);
+        TrackTargetDrawCall(call_info, object_id, true);
     }
 
     virtual void Process_ID3D12GraphicsCommandList_Dispatch(const ApiCallInfo& call_info,
@@ -407,7 +407,7 @@ class Dx12BrowseConsumer : public Dx12Consumer
                                                             UINT               ThreadGroupCountY,
                                                             UINT               ThreadGroupCountZ)
     {
-        TrackTargetDrawcall(call_info, object_id, false);
+        TrackTargetDrawCall(call_info, object_id, false);
     }
 
     virtual void Process_ID3D12GraphicsCommandList_ExecuteIndirect(const ApiCallInfo& call_info,
@@ -419,7 +419,7 @@ class Dx12BrowseConsumer : public Dx12Consumer
                                                                    format::HandleId   pCountBuffer,
                                                                    UINT64             CountBufferOffset)
     {
-        TrackTargetDrawcall(
+        TrackTargetDrawCall(
             call_info, object_id, false, pArgumentBuffer, ArgumentBufferOffset, pCountBuffer, CountBufferOffset);
     }
 
@@ -427,7 +427,7 @@ class Dx12BrowseConsumer : public Dx12Consumer
                                                                  format::HandleId   object_id,
                                                                  format::HandleId   pCommandList)
     {
-        TrackTargetDrawcall(
+        TrackTargetDrawCall(
             call_info, object_id, false, format::kNullHandleId, 0, format::kNullHandleId, 0, pCommandList);
     }
 
@@ -440,9 +440,9 @@ class Dx12BrowseConsumer : public Dx12Consumer
             auto it = track_commandlist_infos_.find(object_id);
             if (it != track_commandlist_infos_.end())
             {
-                for (auto& drawcall : it->second.track_dump_drawcalls)
+                for (auto& draw_call : it->second.track_dump_draw_calls)
                 {
-                    drawcall->close_block_index = call_info.index;
+                    draw_call->close_block_index = call_info.index;
                 }
             }
         }
@@ -464,9 +464,9 @@ class Dx12BrowseConsumer : public Dx12Consumer
                     {
                         ++track_submit_index_;
                         ++dump_resources_target_.submit_index;
-                        dump_resources_target_.command_index  = 0;
-                        dump_resources_target_.drawcall_index = 0;
-                        is_modified_args                      = true;
+                        dump_resources_target_.command_index   = 0;
+                        dump_resources_target_.draw_call_index = 0;
+                        is_modified_args                       = true;
                         return;
                     }
                     else
@@ -486,33 +486,33 @@ class Dx12BrowseConsumer : public Dx12Consumer
                     auto it       = track_commandlist_infos_.find(cmd_list);
                     GFXRECON_ASSERT(it != track_commandlist_infos_.end());
 
-                    uint32_t all_drawcall_count = 0; // Include normal drawcall and bundle drawcall.
-                    uint32_t drawcall_index     = 0;
-                    for (auto& drawcall : it->second.track_dump_drawcalls)
+                    uint32_t all_draw_call_count = 0; // Include normal draw call and bundle draw call.
+                    uint32_t draw_call_index     = 0;
+                    for (auto& draw_call : it->second.track_dump_draw_calls)
                     {
-                        if (drawcall->bundle_commandlist_id != format::kNullHandleId)
+                        if (draw_call->bundle_commandlist_id != format::kNullHandleId)
                         {
-                            auto bundle_it = track_commandlist_infos_.find(drawcall->bundle_commandlist_id);
+                            auto bundle_it = track_commandlist_infos_.find(draw_call->bundle_commandlist_id);
                             if (bundle_it != track_commandlist_infos_.end())
                             {
-                                for (auto& bundle_drawcall : bundle_it->second.track_dump_drawcalls)
+                                for (auto& bundle_draw_call : bundle_it->second.track_dump_draw_calls)
                                 {
-                                    ++all_drawcall_count;
-                                    if (all_drawcall_count > dump_resources_target_.drawcall_index)
+                                    ++all_draw_call_count;
+                                    if (all_draw_call_count > dump_resources_target_.draw_call_index)
                                     {
-                                        if (TEST_AVAILABLE_ARGS == 2 && !bundle_drawcall->is_draw)
+                                        if (TEST_AVAILABLE_ARGS == 2 && !bundle_draw_call->is_draw)
                                         {
-                                            // Find a draw drawcall in the following drawcall.
+                                            // Find a draw draw call in the following draw call.
                                             is_modified_args = true;
-                                            ++dump_resources_target_.drawcall_index;
+                                            ++dump_resources_target_.draw_call_index;
                                         }
                                         else
                                         {
-                                            drawcall->bundle_target_drawcall = bundle_drawcall;
+                                            draw_call->bundle_target_draw_call = bundle_draw_call;
 
-                                            drawcall->execute_block_index = call_info.index;
-                                            target_command_list_          = cmd_list;
-                                            target_drawcall_index_        = drawcall_index;
+                                            draw_call->execute_block_index = call_info.index;
+                                            target_command_list_            = cmd_list;
+                                            target_draw_call_index_         = draw_call_index;
                                             break;
                                         }
                                     }
@@ -521,56 +521,56 @@ class Dx12BrowseConsumer : public Dx12Consumer
                         }
                         else
                         {
-                            ++all_drawcall_count;
-                            if (all_drawcall_count > dump_resources_target_.drawcall_index)
+                            ++all_draw_call_count;
+                            if (all_draw_call_count > dump_resources_target_.draw_call_index)
                             {
-                                if (TEST_AVAILABLE_ARGS == 2 && !drawcall->is_draw)
+                                if (TEST_AVAILABLE_ARGS == 2 && !draw_call->is_draw)
                                 {
-                                    // Find a draw drawcall in the following drawcall.
+                                    // Find a draw call in the following draw call.
                                     is_modified_args = true;
-                                    ++dump_resources_target_.drawcall_index;
+                                    ++dump_resources_target_.draw_call_index;
                                 }
                                 else
                                 {
-                                    drawcall->execute_block_index = call_info.index;
+                                    draw_call->execute_block_index = call_info.index;
                                     target_command_list_          = cmd_list;
-                                    target_drawcall_index_        = drawcall_index;
+                                    target_draw_call_index_        = draw_call_index;
                                     break;
                                 }
                             }
                         }
-                        ++drawcall_index;
+                        ++draw_call_index;
                     }
 
-                    // It didn't find the target drawcall.
+                    // It didn't find the target draw call.
                     if (target_command_list_ == format::kNullHandleId)
                     {
                         if (TEST_AVAILABLE_ARGS > 0)
                         {
-                            // Find a drawcall in the following command list.
+                            // Find a draw call in the following command list.
                             is_modified_args = true;
                             ++dump_resources_target_.command_index;
-                            dump_resources_target_.drawcall_index = 0;
+                            dump_resources_target_.draw_call_index = 0;
                         }
                         else
                         {
-                            GFXRECON_LOG_FATAL("The target drawcall index(%d) of dump resources is out of range(%d).",
-                                               dump_resources_target_.drawcall_index,
-                                               all_drawcall_count);
-                            GFXRECON_ASSERT(all_drawcall_count > dump_resources_target_.drawcall_index);
+                            GFXRECON_LOG_FATAL("The target draw call index(%d) of dump resources is out of range(%d).",
+                                               dump_resources_target_.draw_call_index,
+                                               all_draw_call_count);
+                            GFXRECON_ASSERT(all_draw_call_count > dump_resources_target_.draw_call_index);
                             break;
                         }
                     }
                 }
 
-                // It didn't find the target drawcall.
+                // It didn't find the target draw call.
                 if (TEST_AVAILABLE_ARGS > 0 && target_command_list_ == format::kNullHandleId)
                 {
-                    // Find a drawcall in the following submit.
+                    // Find a draw call in the following submit.
                     is_modified_args = true;
                     ++dump_resources_target_.submit_index;
-                    dump_resources_target_.command_index  = 0;
-                    dump_resources_target_.drawcall_index = 0;
+                    dump_resources_target_.command_index   = 0;
+                    dump_resources_target_.draw_call_index = 0;
                 }
             }
             ++track_submit_index_;
@@ -584,7 +584,7 @@ class Dx12BrowseConsumer : public Dx12Consumer
     DumpResourcesTarget dump_resources_target_{};
     uint32_t            track_submit_index_{ 0 };
     format::HandleId    target_command_list_{ 0 };
-    uint32_t            target_drawcall_index_{ 0 };
+    uint32_t            target_draw_call_index_{ 0 };
 
     // Key is commandlist_id. We need to know the commandlist of the info because in a commandlist block
     // between reset and close, it might have the other commandlist's commands.
@@ -609,7 +609,7 @@ class Dx12BrowseConsumer : public Dx12Consumer
         }
     }
 
-    void TrackTargetDrawcall(const ApiCallInfo& call_info,
+    void TrackTargetDrawCall(const ApiCallInfo& call_info,
                              format::HandleId   object_id,
                              bool               is_draw,
                              format::HandleId   exe_indirect_argument_id     = format::kNullHandleId,
@@ -623,26 +623,26 @@ class Dx12BrowseConsumer : public Dx12Consumer
             auto it = track_commandlist_infos_.find(object_id);
             if (it != track_commandlist_infos_.end())
             {
-                TrackDumpDrawcall track_drawcall                 = {};
-                track_drawcall.command_list_id                   = object_id;
-                track_drawcall.drawcall_block_index              = call_info.index;
-                track_drawcall.is_draw                           = is_draw;
-                track_drawcall.begin_block_index                 = it->second.begin_block_index;
-                track_drawcall.begin_renderpass_block_index      = it->second.current_begin_renderpass_block_index;
-                track_drawcall.set_render_targets_block_index    = it->second.current_set_render_targets_block_index;
-                track_drawcall.root_signature_handle_id          = it->second.current_root_signature_handle_id;
-                track_drawcall.captured_vertex_buffer_views      = it->second.current_captured_vertex_buffer_views;
-                track_drawcall.captured_index_buffer_view        = it->second.current_captured_index_buffer_view;
-                track_drawcall.descriptor_heap_ids               = it->second.current_descriptor_heap_ids;
-                track_drawcall.captured_descriptor_gpu_handles   = it->second.current_captured_descriptor_gpu_handles;
-                track_drawcall.execute_indirect_info.argument_id = exe_indirect_argument_id;
-                track_drawcall.execute_indirect_info.argument_offset = exe_indirect_argument_offset;
-                track_drawcall.execute_indirect_info.count_id        = exe_indirect_count_id;
-                track_drawcall.execute_indirect_info.count_offset    = exe_indirect_count_offset;
-                track_drawcall.bundle_commandlist_id                 = bundle_commandlist_id;
-
-                it->second.track_dump_drawcalls.emplace_back(
-                    std::make_shared<TrackDumpDrawcall>(std::move(track_drawcall)));
+                TrackDumpDrawCall track_draw_call                 = {};
+                track_draw_call.command_list_id                   = object_id;
+                track_draw_call.draw_call_block_index             = call_info.index;
+                track_draw_call.is_draw                           = is_draw;
+                track_draw_call.begin_block_index                 = it->second.begin_block_index;
+                track_draw_call.begin_renderpass_block_index      = it->second.current_begin_renderpass_block_index;
+                track_draw_call.set_render_targets_block_index    = it->second.current_set_render_targets_block_index;
+                track_draw_call.root_signature_handle_id          = it->second.current_root_signature_handle_id;
+                track_draw_call.captured_vertex_buffer_views      = it->second.current_captured_vertex_buffer_views;
+                track_draw_call.captured_index_buffer_view        = it->second.current_captured_index_buffer_view;
+                track_draw_call.descriptor_heap_ids               = it->second.current_descriptor_heap_ids;
+                track_draw_call.captured_descriptor_gpu_handles   = it->second.current_captured_descriptor_gpu_handles;
+                track_draw_call.execute_indirect_info.argument_id = exe_indirect_argument_id;
+                track_draw_call.execute_indirect_info.argument_offset = exe_indirect_argument_offset;
+                track_draw_call.execute_indirect_info.count_id        = exe_indirect_count_id;
+                track_draw_call.execute_indirect_info.count_offset    = exe_indirect_count_offset;
+                track_draw_call.bundle_commandlist_id                 = bundle_commandlist_id;
+
+                it->second.track_dump_draw_calls.emplace_back(
+                    std::make_shared<TrackDumpDrawCall>(std::move(track_draw_call)));
             }
         }
     }
diff --git a/framework/decode/dx12_dump_resources.cpp b/framework/decode/dx12_dump_resources.cpp
index 82b1630e68..033731b33b 100644
--- a/framework/decode/dx12_dump_resources.cpp
+++ b/framework/decode/dx12_dump_resources.cpp
@@ -83,7 +83,7 @@ static const char* Dx12DumpResourcePosToString(graphics::dx12::Dx12DumpResourceP
         case graphics::dx12::Dx12DumpResourcePos::kBeforeDrawCall:
             return "before";
         case graphics::dx12::Dx12DumpResourcePos::kDrawCall:
-            return "drawcall";
+            return "draw_call";
         case graphics::dx12::Dx12DumpResourcePos::kAfterDrawCall:
             return "after";
         default:
@@ -195,14 +195,14 @@ bool Dx12DumpResources::ExecuteCommandLists(DxObjectInfo*
                     // processes, for exmaples: finding resource by GPU VA, getting the resource infomation, and
                     // write resource id, offset, size. But those duplicated processes shouldn't hurt the
                     // performance.
-                    CopyDrawcallResources(replay_object_info,
+                    CopyDrawCallResources(replay_object_info,
                                           front_command_list_ids,
                                           graphics::dx12::Dx12DumpResourcePos::kBeforeDrawCall);
 
                     ID3D12CommandList* ppCommandLists[] = { track_dump_resources_.split_command_sets[1].list };
                     replay_object->ExecuteCommandLists(1, ppCommandLists);
 
-                    CopyDrawcallResources(replay_object_info,
+                    CopyDrawCallResources(replay_object_info,
                                           front_command_list_ids,
                                           graphics::dx12::Dx12DumpResourcePos::kAfterDrawCall);
 
@@ -233,9 +233,9 @@ void Dx12DumpResources::ExecuteBundle(DxObjectInfo* replay_object_info,
     auto dump_command_sets = GetCommandListsForDumpResources(
         replay_object_info, block_index, format::ApiCall_ID3D12GraphicsCommandList_ExecuteBundle);
 
-    // size = 1: this replay_object is the target command list, but this ExecuteBundle isn't the target drawcall.
+    // size = 1: this replay_object is the target command list, but this ExecuteBundle isn't the target draw call.
     // size = 0: this replay_object isn't the target command list.
-    // size = 3: this replay_object is the target command list, also this ExecuteBundle is the target drawcall.
+    // size = 3: this replay_object is the target command list, also this ExecuteBundle is the target draw call.
     if (dump_command_sets.size() == 1)
     {
         dump_command_sets[0].list->ExecuteBundle(command_list);
@@ -469,7 +469,7 @@ void Dx12DumpResources::BeginRenderPass(
             }
             command_list4_before->BeginRenderPass(NumRenderTargets, before_rt_descs.data(), p_before_ds_desc, Flags);
 
-            // drawcall
+            // draw call
             ID3D12GraphicsCommandList4* command_list4_draw_call;
             dump_command_sets[graphics::dx12::kDrawCallArrayIndex].list->QueryInterface(
                 IID_PPV_ARGS(&command_list4_draw_call));
@@ -547,12 +547,12 @@ bool MatchDescriptorCPUGPUHandle(size_t                                      rep
     return false;
 }
 
-void Dx12DumpResources::CopyDrawcallResources(DxObjectInfo*                        queue_object_info,
+void Dx12DumpResources::CopyDrawCallResources(DxObjectInfo*                        queue_object_info,
                                               const std::vector<format::HandleId>& front_command_list_ids,
                                               graphics::dx12::Dx12DumpResourcePos  pos)
 {
     // If Bundle have the bindings, using the bindings, or using the command's bindings.
-    auto bundle_target_drawcall = track_dump_resources_.target.bundle_target_drawcall.get();
+    auto bundle_target_draw_call = track_dump_resources_.target.bundle_target_draw_call.get();
 
     // pair first: path name, second: resource index. If index is kNoneIndex, it means not a array.
     std::vector<std::pair<std::string, int32_t>> json_path;
@@ -561,9 +561,9 @@ void Dx12DumpResources::CopyDrawcallResources(DxObjectInfo*
 
     // vertex
     const std::vector<D3D12_VERTEX_BUFFER_VIEW>* vertex_buffer_views = nullptr;
-    if (bundle_target_drawcall && !bundle_target_drawcall->captured_vertex_buffer_views.empty())
+    if (bundle_target_draw_call && !bundle_target_draw_call->captured_vertex_buffer_views.empty())
     {
-        vertex_buffer_views = &bundle_target_drawcall->captured_vertex_buffer_views;
+        vertex_buffer_views = &bundle_target_draw_call->captured_vertex_buffer_views;
     }
     else
     {
@@ -576,7 +576,7 @@ void Dx12DumpResources::CopyDrawcallResources(DxObjectInfo*
         {
             json_path.clear();
             json_path.emplace_back("vertex", resource_index);
-            CopyDrawcallResourceByGPUVA(queue_object_info,
+            CopyDrawCallResourceByGPUVA(queue_object_info,
                                         front_command_list_ids,
                                         view.BufferLocation,
                                         view.SizeInBytes,
@@ -591,9 +591,9 @@ void Dx12DumpResources::CopyDrawcallResources(DxObjectInfo*
 
     // index
     const D3D12_INDEX_BUFFER_VIEW* index_buffer_view = nullptr;
-    if (bundle_target_drawcall && bundle_target_drawcall->captured_index_buffer_view.BufferLocation != kNullGpuAddress)
+    if (bundle_target_draw_call && bundle_target_draw_call->captured_index_buffer_view.BufferLocation != kNullGpuAddress)
     {
-        index_buffer_view = &bundle_target_drawcall->captured_index_buffer_view;
+        index_buffer_view = &bundle_target_draw_call->captured_index_buffer_view;
     }
     else
     {
@@ -603,7 +603,7 @@ void Dx12DumpResources::CopyDrawcallResources(DxObjectInfo*
     {
         json_path.clear();
         json_path.emplace_back("index", format::kNoneIndex);
-        CopyDrawcallResourceByGPUVA(queue_object_info,
+        CopyDrawCallResourceByGPUVA(queue_object_info,
                                     front_command_list_ids,
                                     index_buffer_view->BufferLocation,
                                     index_buffer_view->SizeInBytes,
@@ -618,17 +618,17 @@ void Dx12DumpResources::CopyDrawcallResources(DxObjectInfo*
     std::vector<std::pair<std::string, int32_t>>       json_path_sub;
     const std::vector<format::HandleId>*               descriptor_heap_ids    = nullptr;
     const std::map<UINT, D3D12_GPU_DESCRIPTOR_HANDLE>* descriptor_gpu_handles = nullptr;
-    if (bundle_target_drawcall && !bundle_target_drawcall->descriptor_heap_ids.empty())
+    if (bundle_target_draw_call && !bundle_target_draw_call->descriptor_heap_ids.empty())
     {
-        descriptor_heap_ids = &bundle_target_drawcall->descriptor_heap_ids;
+        descriptor_heap_ids = &bundle_target_draw_call->descriptor_heap_ids;
     }
     else
     {
         descriptor_heap_ids = &track_dump_resources_.target.descriptor_heap_ids;
     }
-    if (bundle_target_drawcall && !bundle_target_drawcall->captured_descriptor_gpu_handles.empty())
+    if (bundle_target_draw_call && !bundle_target_draw_call->captured_descriptor_gpu_handles.empty())
     {
-        descriptor_gpu_handles = &bundle_target_drawcall->captured_descriptor_gpu_handles;
+        descriptor_gpu_handles = &bundle_target_draw_call->captured_descriptor_gpu_handles;
     }
     else
     {
@@ -662,7 +662,7 @@ void Dx12DumpResources::CopyDrawcallResources(DxObjectInfo*
                 {
                     json_path_sub = json_path;
                     json_path_sub.emplace_back("constant_buffer_views", resource_index);
-                    CopyDrawcallResourceByGPUVA(queue_object_info,
+                    CopyDrawCallResourceByGPUVA(queue_object_info,
                                                 front_command_list_ids,
                                                 info.captured_view.BufferLocation,
                                                 info.captured_view.SizeInBytes,
@@ -708,7 +708,7 @@ void Dx12DumpResources::CopyDrawcallResources(DxObjectInfo*
                         }
                         json_path_sub = json_path;
                         json_path_sub.emplace_back("shader_resource_views", resource_index);
-                        CopyDrawcallResourceBySubresource(queue_object_info,
+                        CopyDrawCallResourceBySubresource(queue_object_info,
                                                           front_command_list_ids,
                                                           info.resource_id,
                                                           offset,
@@ -755,7 +755,7 @@ void Dx12DumpResources::CopyDrawcallResources(DxObjectInfo*
                         json_path_sub = json_path;
                         json_path_sub.emplace_back("unordered_access_views", resource_index);
                         json_path_sub.emplace_back("resource", format::kNoneIndex);
-                        CopyDrawcallResourceBySubresource(queue_object_info,
+                        CopyDrawCallResourceBySubresource(queue_object_info,
                                                           front_command_list_ids,
                                                           info.resource_id,
                                                           offset,
@@ -772,7 +772,7 @@ void Dx12DumpResources::CopyDrawcallResources(DxObjectInfo*
                             json_path_sub = json_path;
                             json_path_sub.emplace_back("unordered_access_views", resource_index);
                             json_path_sub.emplace_back("counter_resource", format::kNoneIndex);
-                            CopyDrawcallResourceBySubresource(queue_object_info,
+                            CopyDrawCallResourceBySubresource(queue_object_info,
                                                               front_command_list_ids,
                                                               info.counter_resource_id,
                                                               info.view.Buffer.CounterOffsetInBytes,
@@ -823,7 +823,7 @@ void Dx12DumpResources::CopyDrawcallResources(DxObjectInfo*
                 }
                 json_path.clear();
                 json_path.emplace_back("render_target_views", resource_index);
-                CopyDrawcallResourceBySubresource(queue_object_info,
+                CopyDrawCallResourceBySubresource(queue_object_info,
                                                   front_command_list_ids,
                                                   info.resource_id,
                                                   0,
@@ -856,7 +856,7 @@ void Dx12DumpResources::CopyDrawcallResources(DxObjectInfo*
             {
                 json_path.clear();
                 json_path.emplace_back("depth_stencil_views", format::kNoneIndex);
-                CopyDrawcallResourceBySubresource(queue_object_info,
+                CopyDrawCallResourceBySubresource(queue_object_info,
                                                   front_command_list_ids,
                                                   info.resource_id,
                                                   0,
@@ -874,9 +874,9 @@ void Dx12DumpResources::CopyDrawcallResources(DxObjectInfo*
 
     // ExecuteIndirect
     const ExecuteIndirectInfo* exe_indirect_info = nullptr;
-    if (bundle_target_drawcall && bundle_target_drawcall->execute_indirect_info.argument_id != format::kNullHandleId)
+    if (bundle_target_draw_call && bundle_target_draw_call->execute_indirect_info.argument_id != format::kNullHandleId)
     {
-        exe_indirect_info = &bundle_target_drawcall->execute_indirect_info;
+        exe_indirect_info = &bundle_target_draw_call->execute_indirect_info;
     }
     else
     {
@@ -886,7 +886,7 @@ void Dx12DumpResources::CopyDrawcallResources(DxObjectInfo*
     {
         json_path.clear();
         json_path.emplace_back("execute_indirect_arguments", format::kNoneIndex);
-        CopyDrawcallResourceBySubresource(queue_object_info,
+        CopyDrawCallResourceBySubresource(queue_object_info,
                                           front_command_list_ids,
                                           exe_indirect_info->argument_id,
                                           exe_indirect_info->argument_offset,
@@ -899,7 +899,7 @@ void Dx12DumpResources::CopyDrawcallResources(DxObjectInfo*
                                           0);
         json_path.clear();
         json_path.emplace_back("execute_indirect_counts", format::kNoneIndex);
-        CopyDrawcallResourceBySubresource(queue_object_info,
+        CopyDrawCallResourceBySubresource(queue_object_info,
                                           front_command_list_ids,
                                           exe_indirect_info->count_id,
                                           exe_indirect_info->count_offset,
@@ -913,7 +913,7 @@ void Dx12DumpResources::CopyDrawcallResources(DxObjectInfo*
     }
 }
 
-void Dx12DumpResources::CopyDrawcallResourceByGPUVA(DxObjectInfo*                        queue_object_info,
+void Dx12DumpResources::CopyDrawCallResourceByGPUVA(DxObjectInfo*                        queue_object_info,
                                                     const std::vector<format::HandleId>& front_command_list_ids,
                                                     D3D12_GPU_VIRTUAL_ADDRESS            captured_source_gpu_va,
                                                     uint64_t                             source_size,
@@ -931,7 +931,7 @@ void Dx12DumpResources::CopyDrawcallResourceByGPUVA(DxObjectInfo*
     auto source_resource_object_info = get_object_info_func_(source_resource_id);
     auto source_resource_extra_info  = GetExtraInfo<D3D12ResourceInfo>(source_resource_object_info);
 
-    CopyDrawcallResourceBySubresource(queue_object_info,
+    CopyDrawCallResourceBySubresource(queue_object_info,
                                       front_command_list_ids,
                                       source_resource_id,
                                       (captured_source_gpu_va - source_resource_extra_info->capture_address_),
@@ -944,7 +944,7 @@ void Dx12DumpResources::CopyDrawcallResourceByGPUVA(DxObjectInfo*
                                       descriptor_heap_index);
 }
 
-void Dx12DumpResources::CopyDrawcallResourceBySubresource(DxObjectInfo*                        queue_object_info,
+void Dx12DumpResources::CopyDrawCallResourceBySubresource(DxObjectInfo*                        queue_object_info,
                                                           const std::vector<format::HandleId>& front_command_list_ids,
                                                           format::HandleId                     source_resource_id,
                                                           uint64_t                             source_offset,
@@ -964,12 +964,12 @@ void Dx12DumpResources::CopyDrawcallResourceBySubresource(DxObjectInfo*
     copy_resource_data->descriptor_heap_id    = descriptor_heap_id;
     copy_resource_data->descriptor_heap_index = descriptor_heap_index;
 
-    CopyDrawcallResource(
+    CopyDrawCallResource(
         queue_object_info, front_command_list_ids, source_resource_id, source_offset, source_size, copy_resource_data);
 }
 
 // If source_size = 0, the meaning is the whole after offset.
-void Dx12DumpResources::CopyDrawcallResource(DxObjectInfo*                        queue_object_info,
+void Dx12DumpResources::CopyDrawCallResource(DxObjectInfo*                        queue_object_info,
                                              const std::vector<format::HandleId>& front_command_list_ids,
                                              format::HandleId                     source_resource_id,
                                              uint64_t                             source_offset,
@@ -1111,7 +1111,7 @@ bool Dx12DumpResources::CopyResourceAsyncQueue(const std::vector<format::HandleI
                     bool is_update = true;
                     if (i == (size - 1))
                     {
-                        if (state.block_index > track_dump_resources_.target.drawcall_block_index)
+                        if (state.block_index > track_dump_resources_.target.draw_call_block_index)
                         {
                             is_update = false;
                         }
@@ -1285,24 +1285,24 @@ std::vector<graphics::dx12::CommandSet> Dx12DumpResources::GetCommandListsForDum
     auto cmd_list            = static_cast<ID3D12GraphicsCommandList*>(command_list_object_info->object);
     auto device              = graphics::dx12::GetDeviceComPtrFromChild<ID3D12Device>(cmd_list);
 
-    std::array<graphics::dx12::CommandSet, 3>* command_sets  = nullptr;
-    TrackDumpDrawcall*                         drawcall_info = nullptr;
-    bool                                       is_bundle     = false;
+    std::array<graphics::dx12::CommandSet, 3>* command_sets   = nullptr;
+    TrackDumpDrawCall*                         draw_call_info = nullptr;
+    bool                                       is_bundle      = false;
     if ((command_list_object_info->capture_id == track_dump_resources_.target.bundle_commandlist_id) &&
-        (track_dump_resources_.target.bundle_target_drawcall != nullptr) &&
-        (track_dump_resources_.target.bundle_target_drawcall->begin_block_index <= block_index) &&
-        (track_dump_resources_.target.bundle_target_drawcall->close_block_index >= block_index))
+        (track_dump_resources_.target.bundle_target_draw_call != nullptr) &&
+        (track_dump_resources_.target.bundle_target_draw_call->begin_block_index <= block_index) &&
+        (track_dump_resources_.target.bundle_target_draw_call->close_block_index >= block_index))
     {
-        is_bundle     = true;
-        command_sets  = &track_dump_resources_.split_bundle_command_sets;
-        drawcall_info = track_dump_resources_.target.bundle_target_drawcall.get();
+        is_bundle      = true;
+        command_sets   = &track_dump_resources_.split_bundle_command_sets;
+        draw_call_info = track_dump_resources_.target.bundle_target_draw_call.get();
     }
     else if ((command_list_object_info->capture_id == track_dump_resources_.target.command_list_id) &&
              (track_dump_resources_.target.begin_block_index <= block_index) &&
              (track_dump_resources_.target.close_block_index >= block_index))
     {
         command_sets  = &track_dump_resources_.split_command_sets;
-        drawcall_info = &track_dump_resources_.target;
+        draw_call_info = &track_dump_resources_.target;
     }
     else
     {
@@ -1327,11 +1327,11 @@ std::vector<graphics::dx12::CommandSet> Dx12DumpResources::GetCommandListsForDum
 
     graphics::dx12::Dx12DumpResourcePos split_type = graphics::dx12::Dx12DumpResourcePos::kBeforeDrawCall;
 
-    if (block_index == drawcall_info->drawcall_block_index)
+    if (block_index == draw_call_info->draw_call_block_index)
     {
         split_type = graphics::dx12::Dx12DumpResourcePos::kDrawCall;
     }
-    else if (block_index > drawcall_info->drawcall_block_index)
+    else if (block_index > draw_call_info->draw_call_block_index)
     {
         split_type = graphics::dx12::Dx12DumpResourcePos::kAfterDrawCall;
     }
@@ -1413,7 +1413,7 @@ std::vector<graphics::dx12::CommandSet> Dx12DumpResources::GetCommandListsForDum
         }
         case format::ApiCall_ID3D12GraphicsCommandList4_BeginRenderPass:
         {
-            if (block_index == drawcall_info->begin_renderpass_block_index)
+            if (block_index == draw_call_info->begin_renderpass_block_index)
             {
                 cmd_sets.insert(cmd_sets.end(), command_sets->begin(), command_sets->end());
             }
@@ -1425,7 +1425,7 @@ std::vector<graphics::dx12::CommandSet> Dx12DumpResources::GetCommandListsForDum
         }
         case format::ApiCall_ID3D12GraphicsCommandList4_EndRenderPass:
         {
-            if (block_index == drawcall_info->end_renderpass_block_index)
+            if (block_index == draw_call_info->end_renderpass_block_index)
             {
                 cmd_sets.insert(cmd_sets.end(), command_sets->begin(), command_sets->end());
             }
@@ -1437,7 +1437,7 @@ std::vector<graphics::dx12::CommandSet> Dx12DumpResources::GetCommandListsForDum
         }
         case format::ApiCall_ID3D12GraphicsCommandList_ExecuteBundle:
         {
-            if (block_index == drawcall_info->drawcall_block_index)
+            if (block_index == draw_call_info->draw_call_block_index)
             {
                 cmd_sets.insert(cmd_sets.end(), command_sets->begin(), command_sets->end());
             }
@@ -1449,7 +1449,7 @@ std::vector<graphics::dx12::CommandSet> Dx12DumpResources::GetCommandListsForDum
         }
         default:
         {
-            // command type could be changed data, drawcalls.
+            // command type could be changed data, draw calls.
             cmd_sets.emplace_back((*command_sets)[split_type_array_index]);
             break;
         }
@@ -1480,10 +1480,10 @@ void DefaultDx12DumpResourcesDelegate::BeginDumpResources(const std::string&
     header_["gfxreconversion"] = GFXRECON_PROJECT_VERSION_STRING;
     header_["captureFile"]     = capture_file_name;
 
-    auto& dr_options       = header_["dumpResourcesOptions"];
-    dr_options["submit"]   = std::to_string(track_dump_resources.target.dump_resources_target.submit_index);
-    dr_options["command"]  = std::to_string(track_dump_resources.target.dump_resources_target.command_index);
-    dr_options["drawcall"] = std::to_string(track_dump_resources.target.dump_resources_target.drawcall_index);
+    auto& dr_options        = header_["dumpResourcesOptions"];
+    dr_options["submit"]    = std::to_string(track_dump_resources.target.dump_resources_target.submit_index);
+    dr_options["command"]   = std::to_string(track_dump_resources.target.dump_resources_target.command_index);
+    dr_options["draw_call"] = std::to_string(track_dump_resources.target.dump_resources_target.draw_call_index);
 
     StartFile();
 
@@ -1494,8 +1494,8 @@ void DefaultDx12DumpResourcesDelegate::BeginDumpResources(const std::string&
 
     WriteBlockStart();
 
-    util::FieldToJson(drawcall_["block_index"], track_dump_resources.target.drawcall_block_index, json_options_);
-    util::FieldToJson(drawcall_["execute_block_index"], track_dump_resources.target.execute_block_index, json_options_);
+    util::FieldToJson(draw_call_["block_index"], track_dump_resources.target.draw_call_block_index, json_options_);
+    util::FieldToJson(draw_call_["execute_block_index"], track_dump_resources.target.execute_block_index, json_options_);
 }
 
 void DefaultDx12DumpResourcesDelegate::DumpResource(CopyResourceDataPtr resource_data)
@@ -1505,7 +1505,7 @@ void DefaultDx12DumpResourcesDelegate::DumpResource(CopyResourceDataPtr resource
 
 void DefaultDx12DumpResourcesDelegate::EndDumpResources()
 {
-    json_data_[NameDrawCall()] = drawcall_;
+    json_data_[NameDrawCall()] = draw_call_;
     WriteBlockEnd();
     EndFile();
 }
@@ -1517,7 +1517,7 @@ void DefaultDx12DumpResourcesDelegate::WriteResource(const CopyResourceDataPtr r
         return;
     }
 
-    auto* jdata_sub = &drawcall_;
+    auto* jdata_sub = &draw_call_;
     for (const auto& path : resource_data->json_path)
     {
         if (path.second == format::kNoneIndex)
diff --git a/framework/decode/dx12_dump_resources.h b/framework/decode/dx12_dump_resources.h
index 109dc08c60..6dd959d308 100644
--- a/framework/decode/dx12_dump_resources.h
+++ b/framework/decode/dx12_dump_resources.h
@@ -75,7 +75,7 @@ struct CopyResourceData
     uint64_t                                        total_size{ 0 };
     bool                                            is_cpu_accessible{ false };
 
-    std::vector<std::vector<uint8_t>> datas; // copy resource drawcall
+    std::vector<std::vector<uint8_t>> datas; // copy resource draw call
 
     graphics::dx12::ID3D12GraphicsCommandListComPtr cmd_list{ nullptr };
     graphics::dx12::ID3D12ResourceComPtr            read_resource{ nullptr };
@@ -115,7 +115,7 @@ typedef std::shared_ptr<CopyResourceData> CopyResourceDataPtr;
 
 struct TrackDumpResources
 {
-    TrackDumpDrawcall target{};
+    TrackDumpDrawCall target{};
 
     // render target
     std::vector<format::HandleId>            render_target_heap_ids;
@@ -175,7 +175,7 @@ class DefaultDx12DumpResourcesDelegate : public Dx12DumpResourcesDelegate
     void WriteBlockStart();
     void WriteBlockEnd();
 
-    constexpr const char* NameDrawCall() const { return "drawcall"; }
+    constexpr const char* NameDrawCall() const { return "draw_call"; }
 
     bool WriteBinaryFile(const std::string& filename, const std::vector<uint8_t>& data, uint64_t offset, uint64_t size);
 
@@ -190,7 +190,7 @@ class DefaultDx12DumpResourcesDelegate : public Dx12DumpResourcesDelegate
     FILE*                  json_file_handle_{ nullptr };
     nlohmann::ordered_json json_data_;
     nlohmann::ordered_json header_;
-    nlohmann::ordered_json drawcall_;
+    nlohmann::ordered_json draw_call_;
     uint32_t               num_objects_{ 0 };
     uint32_t               num_files_{ 0 };
 };
@@ -210,7 +210,7 @@ class Dx12DumpResources
                                                                             uint64_t          block_index,
                                                                             format::ApiCallId api_call_id);
 
-    inline void SetDumpTarget(TrackDumpDrawcall& track_dump_target)
+    inline void SetDumpTarget(TrackDumpDrawCall& track_dump_target)
     {
         track_dump_resources_.target = track_dump_target;
     }
@@ -247,11 +247,11 @@ class Dx12DumpResources
     void FinishDump(DxObjectInfo* queue_object_info);
     void CloseDump();
 
-    void CopyDrawcallResources(DxObjectInfo*                        queue_object_info,
+    void CopyDrawCallResources(DxObjectInfo*                        queue_object_info,
                                const std::vector<format::HandleId>& front_command_list_ids,
                                graphics::dx12::Dx12DumpResourcePos  pos);
 
-    void CopyDrawcallResourceByGPUVA(DxObjectInfo*                                       queue_object_info,
+    void CopyDrawCallResourceByGPUVA(DxObjectInfo*                                       queue_object_info,
                                      const std::vector<format::HandleId>&                front_command_list_ids,
                                      D3D12_GPU_VIRTUAL_ADDRESS                           capture_source_gpu_va,
                                      uint64_t                                            source_size,
@@ -261,7 +261,7 @@ class Dx12DumpResources
                                      format::HandleId                                    descriptor_heap_id,
                                      uint32_t                                            descriptor_heap_index);
 
-    void CopyDrawcallResourceBySubresource(DxObjectInfo*                                       queue_object_info,
+    void CopyDrawCallResourceBySubresource(DxObjectInfo*                                       queue_object_info,
                                            const std::vector<format::HandleId>&                front_command_list_ids,
                                            format::HandleId                                    source_resource_id,
                                            uint64_t                                            source_offset,
@@ -273,7 +273,7 @@ class Dx12DumpResources
                                            format::HandleId                                    descriptor_heap_id,
                                            uint32_t                                            descriptor_heap_index);
 
-    void CopyDrawcallResource(DxObjectInfo*                        queue_object_info,
+    void CopyDrawCallResource(DxObjectInfo*                        queue_object_info,
                               const std::vector<format::HandleId>& front_command_list_ids,
                               format::HandleId                     source_resource_id,
                               uint64_t                             source_offset,
diff --git a/framework/decode/dx12_replay_consumer_base.cpp b/framework/decode/dx12_replay_consumer_base.cpp
index 5ff1719552..659b09e2c2 100644
--- a/framework/decode/dx12_replay_consumer_base.cpp
+++ b/framework/decode/dx12_replay_consumer_base.cpp
@@ -664,7 +664,7 @@ void Dx12ReplayConsumerBase::RemoveObject(DxObjectInfo* info)
     }
 }
 
-void Dx12ReplayConsumerBase::SetDumpTarget(TrackDumpDrawcall& track_dump_target)
+void Dx12ReplayConsumerBase::SetDumpTarget(TrackDumpDrawCall& track_dump_target)
 {
     if (!dump_resources_)
     {
@@ -4342,8 +4342,8 @@ void Dx12ReplayConsumerBase::PreCall_ID3D12GraphicsCommandList_ResourceBarrier(
         {
             // It shouldn't change the state here. It should save the AfterState until ExecuteCommandList to change
             // it. It needs to record the code index. The reason is that it needs to know if this ResourceBarrier is
-            // before or after the target drawcall. For dump resources to set the correct state,
-            // it only cares before the target drawcall.
+            // before or after the target draw call. For dump resources to set the correct state,
+            // it only cares before the target draw call.
             ResourceStatesOrder state;
             state.block_index   = call_info.index;
             state.transition    = *barriers[i].Transition->decoded_value;
diff --git a/framework/decode/dx12_replay_consumer_base.h b/framework/decode/dx12_replay_consumer_base.h
index 03d21930bc..3a70e5f395 100644
--- a/framework/decode/dx12_replay_consumer_base.h
+++ b/framework/decode/dx12_replay_consumer_base.h
@@ -233,7 +233,7 @@ class Dx12ReplayConsumerBase : public Dx12Consumer
 
     void RemoveObject(DxObjectInfo* info);
 
-    void SetDumpTarget(TrackDumpDrawcall& track_dump_target);
+    void SetDumpTarget(TrackDumpDrawCall& track_dump_target);
 
     IDXGIAdapter* GetAdapter();
 
diff --git a/framework/decode/dx_replay_options.h b/framework/decode/dx_replay_options.h
index dd4faf17b1..43bd47b58a 100644
--- a/framework/decode/dx_replay_options.h
+++ b/framework/decode/dx_replay_options.h
@@ -43,7 +43,7 @@ struct DumpResourcesTarget
 {
     uint32_t submit_index{ 0 };
     uint32_t command_index{ 0 };
-    uint32_t drawcall_index{ 0 };
+    uint32_t draw_call_index{ 0 };
 };
 
 struct DxReplayOptions : public ReplayOptions
diff --git a/framework/encode/api_capture_manager.h b/framework/encode/api_capture_manager.h
index 9e3bfc3a03..b40e4a11ba 100644
--- a/framework/encode/api_capture_manager.h
+++ b/framework/encode/api_capture_manager.h
@@ -200,8 +200,8 @@ class ApiCaptureManager
     util::Keyboard&                   GetKeyboard() { return common_manager_->GetKeyboard(); }
     const std::string&                GetScreenshotPrefix() const { return common_manager_->GetScreenshotPrefix(); }
     util::ScreenshotFormat            GetScreenshotFormat() { return common_manager_->GetScreenshotFormat(); }
-    auto                              GetTrimBundary() const { return common_manager_->GetTrimBundary(); }
-    auto                              GetTrimDrawcalls() const { return common_manager_->GetTrimDrawcalls(); }
+    auto                              GetTrimBoundary() const { return common_manager_->GetTrimBoundary(); }
+    auto                              GetTrimDrawCalls() const { return common_manager_->GetTrimDrawCalls(); }
 
   protected:
     const format::ApiFamilyId api_family_;
diff --git a/framework/encode/capture_manager.cpp b/framework/encode/capture_manager.cpp
index 5676626946..d8faa2ffc0 100644
--- a/framework/encode/capture_manager.cpp
+++ b/framework/encode/capture_manager.cpp
@@ -372,7 +372,7 @@ bool CommonCaptureManager::Initialize(format::ApiFamilyId                   api_
     }
 
     if (trace_settings.trim_ranges.empty() && trace_settings.trim_key.empty() &&
-        trace_settings.trim_boundary != CaptureSettings::TrimBoundary::kDrawcalls &&
+        trace_settings.trim_boundary != CaptureSettings::TrimBoundary::kDrawCalls &&
         trace_settings.runtime_capture_trigger == CaptureSettings::RuntimeTriggerState::kNotUsed)
     {
         // Use default kModeWrite capture mode.
@@ -445,10 +445,10 @@ bool CommonCaptureManager::Initialize(format::ApiFamilyId                   api_
                 capture_mode_ = kModeTrack;
             }
         }
-        else if (trim_boundary_ == CaptureSettings::TrimBoundary::kDrawcalls)
+        else if (trim_boundary_ == CaptureSettings::TrimBoundary::kDrawCalls)
         {
-            trim_drawcalls_ = trace_settings.trim_drawcalls;
-            capture_mode_   = kModeTrack;
+            trim_draw_calls_ = trace_settings.trim_draw_calls;
+            capture_mode_    = kModeTrack;
         }
         else
         {
@@ -750,7 +750,7 @@ void CommonCaptureManager::CheckContinueCaptureForWriteMode(format::ApiFamilyId
     }
 }
 
-void CommonCaptureManager::DeactivateTrimmingDrawcalls()
+void CommonCaptureManager::DeactivateTrimmingDrawCalls()
 {
     if (trim_enabled_)
     {
@@ -814,18 +814,18 @@ void CommonCaptureManager::CheckStartCaptureForTrackMode(format::ApiFamilyId api
     }
 }
 
-void CommonCaptureManager::ActivateTrimmingDrawcalls(format::ApiFamilyId api_family)
+void CommonCaptureManager::ActivateTrimmingDrawCalls(format::ApiFamilyId api_family)
 {
     if (((capture_mode_ & kModeWrite) != kModeWrite) && ((capture_mode_ & kModeTrack) == kModeTrack))
     {
-        bool success = CreateCaptureFile(api_family, CreateTrimDrawcallsFilename(base_filename_, trim_drawcalls_));
+        bool success = CreateCaptureFile(api_family, CreateTrimDrawCallsFilename(base_filename_, trim_draw_calls_));
         if (success)
         {
             ActivateTrimming();
         }
         else
         {
-            GFXRECON_LOG_FATAL("Failed to initialize capture for trim drawcalls; capture has been disabled");
+            GFXRECON_LOG_FATAL("Failed to initialize capture for trim draw calls; capture has been disabled");
             trim_enabled_ = false;
             capture_mode_ = kModeDisabled;
         }
@@ -914,7 +914,7 @@ void CommonCaptureManager::EndFrame(format::ApiFamilyId api_family)
 void CommonCaptureManager::PreQueueSubmit(format::ApiFamilyId api_family)
 {
     // ++ here means it's 1-based. When it changes to 0-based, it needs to move to the bottom of
-    // CommonCaptureManager::PostQueueSubmit and make sure trimming kQueueSubmits and kDrawcalls work correctly.
+    // CommonCaptureManager::PostQueueSubmit and make sure trimming kQueueSubmits and kDrawCalls work correctly.
     ++queue_submit_count_;
 
     if (trim_enabled_ && (trim_boundary_ == CaptureSettings::TrimBoundary::kQueueSubmits))
@@ -974,31 +974,31 @@ std::string CommonCaptureManager::CreateTrimFilename(const std::string&     base
     return util::filepath::InsertFilenamePostfix(base_filename, range_string);
 }
 
-std::string CommonCaptureManager::CreateTrimDrawcallsFilename(const std::string&                    base_filename,
-                                                              const CaptureSettings::TrimDrawcalls& trim_drawcalls)
+std::string CommonCaptureManager::CreateTrimDrawCallsFilename(const std::string&                    base_filename,
+                                                              const CaptureSettings::TrimDrawCalls& trim_draw_calls)
 {
     std::string range_string = "_";
 
-    uint32_t total = trim_drawcalls.drawcall_indices.last - trim_drawcalls.drawcall_indices.first + 1;
+    uint32_t total = trim_draw_calls.draw_call_indices.last - trim_draw_calls.draw_call_indices.first + 1;
     uint32_t bundle_total =
-        trim_drawcalls.bundle_drawcall_indices.last - trim_drawcalls.bundle_drawcall_indices.first + 1;
-    const char* boundary_str = (total > 1 || bundle_total > 1) ? "drawcalls_" : "drawcall_";
+        trim_draw_calls.bundle_draw_call_indices.last - trim_draw_calls.bundle_draw_call_indices.first + 1;
+    const char* boundary_str = (total > 1 || bundle_total > 1) ? "draw_calls_" : "draw_call_";
 
     range_string += boundary_str;
-    range_string += std::to_string(trim_drawcalls.submit_index) + "_" + std::to_string(trim_drawcalls.command_index) +
-                    "_" + std::to_string(trim_drawcalls.drawcall_indices.first);
+    range_string += std::to_string(trim_draw_calls.submit_index) + "_" + std::to_string(trim_draw_calls.command_index) +
+                    "_" + std::to_string(trim_draw_calls.draw_call_indices.first);
     if (total > 1)
     {
         range_string += "_through_";
-        range_string += std::to_string(trim_drawcalls.drawcall_indices.last);
+        range_string += std::to_string(trim_draw_calls.draw_call_indices.last);
     }
 
-    range_string += "_" + std::to_string(trim_drawcalls.bundle_drawcall_indices.first);
+    range_string += "_" + std::to_string(trim_draw_calls.bundle_draw_call_indices.first);
 
     if (bundle_total > 1)
     {
         range_string += "_through_";
-        range_string += std::to_string(trim_drawcalls.bundle_drawcall_indices.last);
+        range_string += std::to_string(trim_draw_calls.bundle_draw_call_indices.last);
     }
 
     return util::filepath::InsertFilenamePostfix(base_filename, range_string);
diff --git a/framework/encode/capture_manager.h b/framework/encode/capture_manager.h
index 3583e3470b..d1f24e6cb2 100644
--- a/framework/encode/capture_manager.h
+++ b/framework/encode/capture_manager.h
@@ -132,9 +132,9 @@ class CommonCaptureManager
 
     void CheckStartCaptureForTrackMode(format::ApiFamilyId api_family, uint32_t current_boundary_count);
 
-    void ActivateTrimmingDrawcalls(format::ApiFamilyId api_family);
+    void ActivateTrimmingDrawCalls(format::ApiFamilyId api_family);
 
-    void DeactivateTrimmingDrawcalls();
+    void DeactivateTrimmingDrawCalls();
 
     bool IsTrimHotkeyPressed();
 
@@ -260,8 +260,8 @@ class CommonCaptureManager
     bool                                GetDebugDeviceLostSetting() const { return debug_device_lost_; }
     bool                                GetDisableDxrSetting() const { return disable_dxr_; }
     auto                                GetAccelStructPaddingSetting() const { return accel_struct_padding_; }
-    auto                                GetTrimBundary() const { return trim_boundary_; }
-    auto                                GetTrimDrawcalls() const { return trim_drawcalls_; }
+    auto                                GetTrimBoundary() const { return trim_boundary_; }
+    auto                                GetTrimDrawCalls() const { return trim_draw_calls_; }
     auto                                GetQueueSubmitCount() const { return queue_submit_count_; }
 
     util::Compressor*      GetCompressor() { return compressor_.get(); }
@@ -271,8 +271,8 @@ class CommonCaptureManager
     util::ScreenshotFormat GetScreenShotFormat() const { return screenshot_format_; }
 
     std::string CreateTrimFilename(const std::string& base_filename, const util::UintRange& trim_range);
-    std::string CreateTrimDrawcallsFilename(const std::string&                    base_filename,
-                                            const CaptureSettings::TrimDrawcalls& trim_drawcalls);
+    std::string CreateTrimDrawCallsFilename(const std::string&                    base_filename,
+                                            const CaptureSettings::TrimDrawCalls& trim_draw_calls);
     bool        CreateCaptureFile(format::ApiFamilyId api_family, const std::string& base_filename);
     void        WriteCaptureOptions(std::string& operation_annotation);
     void        ActivateTrimming();
@@ -369,7 +369,7 @@ class CommonCaptureManager
     bool                                    trim_enabled_;
     CaptureSettings::TrimBoundary           trim_boundary_;
     std::vector<util::UintRange>            trim_ranges_;
-    CaptureSettings::TrimDrawcalls          trim_drawcalls_;
+    CaptureSettings::TrimDrawCalls          trim_draw_calls_;
     std::string                             trim_key_;
     uint32_t                                trim_key_frames_;
     uint32_t                                trim_key_first_frame_;
diff --git a/framework/encode/capture_settings.cpp b/framework/encode/capture_settings.cpp
index 5c867aceaf..d2212e9d14 100644
--- a/framework/encode/capture_settings.cpp
+++ b/framework/encode/capture_settings.cpp
@@ -82,8 +82,8 @@ GFXRECON_BEGIN_NAMESPACE(encode)
 #define SCREENSHOT_FRAMES_UPPER                              "SCREENSHOT_FRAMES"
 #define CAPTURE_FRAMES_LOWER                                 "capture_frames"
 #define CAPTURE_FRAMES_UPPER                                 "CAPTURE_FRAMES"
-#define CAPTURE_DRAWCALLS_LOWER                              "capture_drawcalls"
-#define CAPTURE_DRAWCALLS_UPPER                              "CAPTURE_DRAWCALLS"
+#define CAPTURE_DRAW_CALLS_LOWER                             "capture_draw_calls"
+#define CAPTURE_DRAW_CALLS_UPPER                             "CAPTURE_DRAW_CALLS"
 #define QUIT_AFTER_CAPTURE_FRAMES_LOWER                      "quit_after_capture_frames"
 #define QUIT_AFTER_CAPTURE_FRAMES_UPPER                      "QUIT_AFTER_CAPTURE_FRAMES"
 #define CAPTURE_TRIGGER_LOWER                                "capture_trigger"
@@ -163,7 +163,7 @@ const char kScreenshotDirEnvVar[]                            = GFXRECON_ENV_VAR_
 const char kScreenshotFormatEnvVar[]                         = GFXRECON_ENV_VAR_PREFIX SCREENSHOT_FORMAT_LOWER;
 const char kScreenshotFramesEnvVar[]                         = GFXRECON_ENV_VAR_PREFIX SCREENSHOT_FRAMES_LOWER;
 const char kCaptureFramesEnvVar[]                            = GFXRECON_ENV_VAR_PREFIX CAPTURE_FRAMES_LOWER;
-const char kCaptureDrawcallsEnvVar[]                         = GFXRECON_ENV_VAR_PREFIX CAPTURE_DRAWCALLS_LOWER;
+const char kCaptureDrawCallsEnvVar[]                         = GFXRECON_ENV_VAR_PREFIX CAPTURE_DRAW_CALLS_LOWER;
 const char kQuitAfterFramesEnvVar[]                          = GFXRECON_ENV_VAR_PREFIX QUIT_AFTER_CAPTURE_FRAMES_LOWER;
 const char kCaptureTriggerEnvVar[]                           = GFXRECON_ENV_VAR_PREFIX CAPTURE_TRIGGER_LOWER;
 const char kCaptureTriggerFramesEnvVar[]                     = GFXRECON_ENV_VAR_PREFIX CAPTURE_TRIGGER_FRAMES_LOWER;
@@ -217,7 +217,7 @@ const char kScreenshotDirEnvVar[]                            = GFXRECON_ENV_VAR_
 const char kScreenshotFormatEnvVar[]                         = GFXRECON_ENV_VAR_PREFIX SCREENSHOT_FORMAT_UPPER;
 const char kScreenshotFramesEnvVar[]                         = GFXRECON_ENV_VAR_PREFIX SCREENSHOT_FRAMES_UPPER;
 const char kCaptureFramesEnvVar[]                            = GFXRECON_ENV_VAR_PREFIX CAPTURE_FRAMES_UPPER;
-const char kCaptureDrawcallsEnvVar[]                         = GFXRECON_ENV_VAR_PREFIX CAPTURE_DRAWCALLS_UPPER;
+const char kCaptureDrawCallsEnvVar[]                         = GFXRECON_ENV_VAR_PREFIX CAPTURE_DRAW_CALLS_UPPER;
 const char kQuitAfterFramesEnvVar[]                          = GFXRECON_ENV_VAR_PREFIX QUIT_AFTER_CAPTURE_FRAMES_UPPER;
 const char kPageGuardCopyOnMapEnvVar[]                       = GFXRECON_ENV_VAR_PREFIX PAGE_GUARD_COPY_ON_MAP_UPPER;
 const char kPageGuardSeparateReadEnvVar[]                    = GFXRECON_ENV_VAR_PREFIX PAGE_GUARD_SEPARATE_READ_UPPER;
@@ -269,7 +269,7 @@ const std::string kOptionKeyScreenshotDir                            = std::stri
 const std::string kOptionKeyScreenshotFormat                         = std::string(kSettingsFilter) + std::string(SCREENSHOT_FORMAT_LOWER);
 const std::string kOptionKeyScreenshotFrames                         = std::string(kSettingsFilter) + std::string(SCREENSHOT_FRAMES_LOWER);
 const std::string kOptionKeyCaptureFrames                            = std::string(kSettingsFilter) + std::string(CAPTURE_FRAMES_LOWER);
-const std::string kOptionKeyCaptureDrawcalls                         = std::string(kSettingsFilter) + std::string(CAPTURE_DRAWCALLS_LOWER);
+const std::string kOptionKeyCaptureDrawCalls                         = std::string(kSettingsFilter) + std::string(CAPTURE_DRAW_CALLS_LOWER);
 const std::string kOptionKeyQuitAfterCaptureFrames                   = std::string(kSettingsFilter) + std::string(QUIT_AFTER_CAPTURE_FRAMES_LOWER);
 const std::string kOptionKeyCaptureTrigger                           = std::string(kSettingsFilter) + std::string(CAPTURE_TRIGGER_LOWER);
 const std::string kOptionKeyCaptureTriggerFrames                     = std::string(kSettingsFilter) + std::string(CAPTURE_TRIGGER_FRAMES_LOWER);
@@ -408,7 +408,7 @@ void CaptureSettings::LoadOptionsEnvVar(OptionsMap* options)
 
     // Trimming environment variables
     LoadSingleOptionEnvVar(options, kCaptureFramesEnvVar, kOptionKeyCaptureFrames);
-    LoadSingleOptionEnvVar(options, kCaptureDrawcallsEnvVar, kOptionKeyCaptureDrawcalls);
+    LoadSingleOptionEnvVar(options, kCaptureDrawCallsEnvVar, kOptionKeyCaptureDrawCalls);
     LoadSingleOptionEnvVar(options, kQuitAfterFramesEnvVar, kOptionKeyQuitAfterCaptureFrames);
     LoadSingleOptionEnvVar(options, kCaptureTriggerEnvVar, kOptionKeyCaptureTrigger);
     LoadSingleOptionEnvVar(options, kCaptureTriggerFramesEnvVar, kOptionKeyCaptureTriggerFrames);
@@ -507,29 +507,29 @@ void CaptureSettings::ProcessOptions(OptionsMap* options, CaptureSettings* setti
         }
     }
 
-    std::string trim_drawcalls = FindOption(options, kOptionKeyCaptureDrawcalls);
-    if (!trim_drawcalls.empty())
+    std::string trim_draw_calls = FindOption(options, kOptionKeyCaptureDrawCalls);
+    if (!trim_draw_calls.empty())
     {
         std::vector<util::UintRange> trim_values;
-        ParseUintRangeList(trim_drawcalls, &trim_values, "capture drawcalls", false, true);
+        ParseUintRangeList(trim_draw_calls, &trim_values, "capture draw calls", false, true);
         if (trim_values.size() == 3 || trim_values.size() == 4)
         {
-            settings->trace_settings_.trim_drawcalls.submit_index           = trim_values[0].first;
-            settings->trace_settings_.trim_drawcalls.command_index          = trim_values[1].first;
-            settings->trace_settings_.trim_drawcalls.drawcall_indices.first = trim_values[2].first;
-            settings->trace_settings_.trim_drawcalls.drawcall_indices.last  = trim_values[2].last;
-            settings->trace_settings_.trim_boundary                         = TrimBoundary::kDrawcalls;
+            settings->trace_settings_.trim_draw_calls.submit_index            = trim_values[0].first;
+            settings->trace_settings_.trim_draw_calls.command_index           = trim_values[1].first;
+            settings->trace_settings_.trim_draw_calls.draw_call_indices.first = trim_values[2].first;
+            settings->trace_settings_.trim_draw_calls.draw_call_indices.last  = trim_values[2].last;
+            settings->trace_settings_.trim_boundary                           = TrimBoundary::kDrawCalls;
 
             if (trim_values.size() == 4)
             {
-                settings->trace_settings_.trim_drawcalls.bundle_drawcall_indices.first = trim_values[3].first;
-                settings->trace_settings_.trim_drawcalls.bundle_drawcall_indices.last  = trim_values[3].last;
+                settings->trace_settings_.trim_draw_calls.bundle_draw_call_indices.first = trim_values[3].first;
+                settings->trace_settings_.trim_draw_calls.bundle_draw_call_indices.last  = trim_values[3].last;
             }
             else
             {
-                // bundle_drawcall_indices is the 4th arg. The default is 0 if it doesn't set.
-                settings->trace_settings_.trim_drawcalls.bundle_drawcall_indices.first = 0;
-                settings->trace_settings_.trim_drawcalls.bundle_drawcall_indices.last  = 0;
+                // bundle_draw_call_indices is the 4th arg. The default is 0 if it doesn't set.
+                settings->trace_settings_.trim_draw_calls.bundle_draw_call_indices.first = 0;
+                settings->trace_settings_.trim_draw_calls.bundle_draw_call_indices.last  = 0;
             }
         }
     }
diff --git a/framework/encode/capture_settings.h b/framework/encode/capture_settings.h
index 4cd6911de7..e1951f6405 100644
--- a/framework/encode/capture_settings.h
+++ b/framework/encode/capture_settings.h
@@ -74,18 +74,18 @@ class CaptureSettings
         kUnknown,
         kFrames,
         kQueueSubmits,
-        kDrawcalls,
+        kDrawCalls,
     };
 
     const static char kDefaultCaptureFileName[];
 
-    struct TrimDrawcalls
+    struct TrimDrawCalls
     {
         // 0-based
         uint32_t        submit_index{ 0 };
         uint32_t        command_index{ 0 };
-        util::UintRange drawcall_indices;
-        util::UintRange bundle_drawcall_indices;
+        util::UintRange draw_call_indices;
+        util::UintRange bundle_draw_call_indices;
     };
 
     struct ResourveValueAnnotationInfo
@@ -109,7 +109,7 @@ class CaptureSettings
         util::ScreenshotFormat       screenshot_format;
         TrimBoundary                 trim_boundary{ TrimBoundary::kUnknown };
         std::vector<util::UintRange> trim_ranges;
-        TrimDrawcalls                trim_drawcalls;
+        TrimDrawCalls                trim_draw_calls;
         std::string                  trim_key;
         uint32_t                     trim_key_frames{ 0 };
         RuntimeTriggerState          runtime_capture_trigger{ kNotUsed };
diff --git a/framework/encode/d3d12_capture_manager.cpp b/framework/encode/d3d12_capture_manager.cpp
index 2696755f7e..0f3d8c43b5 100644
--- a/framework/encode/d3d12_capture_manager.cpp
+++ b/framework/encode/d3d12_capture_manager.cpp
@@ -1738,18 +1738,18 @@ void D3D12CaptureManager::PreProcess_ID3D12CommandQueue_ExecuteCommandLists(ID3D
     GFXRECON_UNREFERENCED_PARAMETER(num_lists);
     GFXRECON_UNREFERENCED_PARAMETER(lists);
 
-    if (IsTrimEnabled() && GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+    if (IsTrimEnabled() && GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
     {
-        auto trim_drawcalls = GetTrimDrawcalls();
-        if (common_manager_->GetQueueSubmitCount() == trim_drawcalls.submit_index)
+        auto trim_draw_calls = GetTrimDrawCalls();
+        if (common_manager_->GetQueueSubmitCount() == trim_draw_calls.submit_index)
         {
             // before of lists and splitted
             std::vector<ID3D12CommandList*> cmdlists;
-            for (uint32_t i = 0; (i + 1) < trim_drawcalls.command_index; ++i)
+            for (uint32_t i = 0; (i + 1) < trim_draw_calls.command_index; ++i)
             {
                 cmdlists.emplace_back(lists[i]);
             }
-            auto                       target_cmdlist = lists[trim_drawcalls.command_index];
+            auto                       target_cmdlist = lists[trim_draw_calls.command_index];
             ID3D12CommandList_Wrapper* target_wrapper = nullptr;
             target_cmdlist->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&target_wrapper));
             GFXRECON_ASSERT(target_wrapper);
@@ -1757,9 +1757,9 @@ void D3D12CaptureManager::PreProcess_ID3D12CommandQueue_ExecuteCommandLists(ID3D
             auto target_info = target_wrapper->GetObjectInfo();
             GFXRECON_ASSERT(target_info);
 
-            auto before_drawcall_cmd = target_info->split_command_sets[graphics::dx12::kBeforeDrawCallArrayIndex].list;
-            GFXRECON_ASSERT(before_drawcall_cmd);
-            cmdlists.emplace_back(before_drawcall_cmd);
+            auto before_draw_call_cmd = target_info->split_command_sets[graphics::dx12::kBeforeDrawCallArrayIndex].list;
+            GFXRECON_ASSERT(before_draw_call_cmd);
+            cmdlists.emplace_back(before_draw_call_cmd);
 
             auto queue         = wrapper->GetWrappedObjectAs<ID3D12CommandQueue>();
             auto unwrap_memory = GetHandleUnwrapMemory();
@@ -1825,17 +1825,17 @@ void D3D12CaptureManager::OverrideID3D12CommandQueue_ExecuteCommandLists(ID3D12C
     auto unwrap_memory = GetHandleUnwrapMemory();
 
     bool is_complete = false;
-    if (IsTrimEnabled() && GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+    if (IsTrimEnabled() && GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
     {
-        auto trim_drawcalls = GetTrimDrawcalls();
+        auto trim_draw_calls = GetTrimDrawCalls();
         // TODO: When queue_submit_count_ becomes 0-based, remove "-1".
-        if ((common_manager_->GetQueueSubmitCount() - 1) == trim_drawcalls.submit_index)
+        if ((common_manager_->GetQueueSubmitCount() - 1) == trim_draw_calls.submit_index)
         {
             // target of splitted
-            common_manager_->ActivateTrimmingDrawcalls(format::ApiFamilyId::ApiFamily_D3D12);
+            common_manager_->ActivateTrimmingDrawCalls(format::ApiFamilyId::ApiFamily_D3D12);
 
             std::vector<ID3D12CommandList*> cmdlists;
-            auto                            target_cmdlist = lists[trim_drawcalls.command_index];
+            auto                            target_cmdlist = lists[trim_draw_calls.command_index];
             ID3D12CommandList_Wrapper*      target_wrapper = nullptr;
             target_cmdlist->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&target_wrapper));
             GFXRECON_ASSERT(target_wrapper);
@@ -1843,9 +1843,9 @@ void D3D12CaptureManager::OverrideID3D12CommandQueue_ExecuteCommandLists(ID3D12C
             auto target_info = target_wrapper->GetObjectInfo();
             GFXRECON_ASSERT(target_info);
 
-            auto target_drawcall_cmd = target_info->split_command_sets[graphics::dx12::kDrawCallArrayIndex].list;
-            GFXRECON_ASSERT(target_drawcall_cmd);
-            cmdlists.emplace_back(target_drawcall_cmd);
+            auto target_draw_call_cmd = target_info->split_command_sets[graphics::dx12::kDrawCallArrayIndex].list;
+            GFXRECON_ASSERT(target_draw_call_cmd);
+            cmdlists.emplace_back(target_draw_call_cmd);
 
             queue->ExecuteCommandLists(
                 cmdlists.size(), UnwrapObjects<ID3D12CommandList>(cmdlists.data(), cmdlists.size(), unwrap_memory));
@@ -1854,14 +1854,14 @@ void D3D12CaptureManager::OverrideID3D12CommandQueue_ExecuteCommandLists(ID3D12C
 
             cmdlists.clear();
 
-            common_manager_->DeactivateTrimmingDrawcalls();
+            common_manager_->DeactivateTrimmingDrawCalls();
 
             // after of splitted and lists
-            auto after_drawcall_cmd = target_info->split_command_sets[graphics::dx12::kAfterDrawCallArrayIndex].list;
-            GFXRECON_ASSERT(after_drawcall_cmd);
-            cmdlists.emplace_back(after_drawcall_cmd);
+            auto after_draw_call_cmd = target_info->split_command_sets[graphics::dx12::kAfterDrawCallArrayIndex].list;
+            GFXRECON_ASSERT(after_draw_call_cmd);
+            cmdlists.emplace_back(after_draw_call_cmd);
 
-            for (uint32_t i = trim_drawcalls.command_index; i < num_lists; ++i)
+            for (uint32_t i = trim_draw_calls.command_index; i < num_lists; ++i)
             {
                 cmdlists.emplace_back(lists[i]);
             }
@@ -1898,7 +1898,7 @@ void D3D12CaptureManager::PostProcess_ID3D12GraphicsCommandList_DrawInstanced(
     UINT                               StartInstanceLocatio)
 {
     auto info = command_list_wrapper->GetObjectInfo();
-    ++info->drawcall_count;
+    ++info->draw_call_count;
 }
 
 void D3D12CaptureManager::PostProcess_ID3D12GraphicsCommandList_DrawIndexedInstanced(
@@ -1910,7 +1910,7 @@ void D3D12CaptureManager::PostProcess_ID3D12GraphicsCommandList_DrawIndexedInsta
     UINT                               StartInstanceLocation)
 {
     auto info = command_list_wrapper->GetObjectInfo();
-    ++info->drawcall_count;
+    ++info->draw_call_count;
 }
 
 void D3D12CaptureManager::PostProcess_ID3D12GraphicsCommandList_Dispatch(
@@ -1920,7 +1920,7 @@ void D3D12CaptureManager::PostProcess_ID3D12GraphicsCommandList_Dispatch(
     UINT                               ThreadGroupCountZ)
 {
     auto info = command_list_wrapper->GetObjectInfo();
-    ++info->drawcall_count;
+    ++info->draw_call_count;
 }
 
 void D3D12CaptureManager::PostProcess_ID3D12GraphicsCommandList_ExecuteIndirect(
@@ -1933,14 +1933,14 @@ void D3D12CaptureManager::PostProcess_ID3D12GraphicsCommandList_ExecuteIndirect(
     UINT64                             CountBufferOffset)
 {
     auto info = command_list_wrapper->GetObjectInfo();
-    ++info->drawcall_count;
+    ++info->draw_call_count;
 }
 
 void D3D12CaptureManager::PostProcess_ID3D12GraphicsCommandList_ExecuteBundle(
     ID3D12GraphicsCommandList_Wrapper* command_list_wrapper, ID3D12GraphicsCommandList* pCommandList)
 {
     auto info = command_list_wrapper->GetObjectInfo();
-    ++info->drawcall_count;
+    ++info->draw_call_count;
 }
 
 D3D12_CPU_DESCRIPTOR_HANDLE D3D12CaptureManager::OverrideID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(
@@ -2914,24 +2914,24 @@ HRESULT D3D12CaptureManager::OverrideID3D12GraphicsCommandList_Reset(ID3D12Graph
     auto result   = cmd_list->Reset(encode::GetWrappedObject<ID3D12CommandAllocator>(pAllocator),
                                   encode::GetWrappedObject<ID3D12PipelineState>(pInitialState));
 
-    if (GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+    if (GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
     {
         DecrementCallScope();
 
-        auto trim_drawcalls_command_sets =
-            GetCommandListsForTrimDrawcalls(wrapper, format::ApiCall_ID3D12GraphicsCommandList_Reset);
-        for (auto& command_set : trim_drawcalls_command_sets)
+        auto trim_draw_calls_command_sets =
+            GetCommandListsForTrimDrawCalls(wrapper, format::ApiCall_ID3D12GraphicsCommandList_Reset);
+        for (auto& command_set : trim_draw_calls_command_sets)
         {
             ID3D12GraphicsCommandList_Wrapper* list_wrapper = nullptr;
             command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&list_wrapper));
-            HRESULT result_trim_drawcalls = list_wrapper->Reset(command_set.allocator, pInitialState);
+            HRESULT result_trim_draw_calls = list_wrapper->Reset(command_set.allocator, pInitialState);
 
-            if (result != result_trim_drawcalls)
+            if (result != result_trim_draw_calls)
             {
                 GFXRECON_LOG_WARNING(
                     "Splitting commandlists of ID3D12GraphicsCommandList::Reset get different results: %s and %s",
                     decode::enumutil::GetResultValueString(result).c_str(),
-                    decode::enumutil::GetResultValueString(result_trim_drawcalls).c_str());
+                    decode::enumutil::GetResultValueString(result_trim_draw_calls).c_str());
             }
         }
         IncrementCallScope();
@@ -2945,16 +2945,16 @@ void D3D12CaptureManager::OverrideID3D12GraphicsCommandList_ExecuteBundle(ID3D12
     auto cmd_list = wrapper->GetWrappedObjectAs<ID3D12GraphicsCommandList>();
     cmd_list->ExecuteBundle(encode::GetWrappedObject<ID3D12GraphicsCommandList>(pCommandList));
 
-    if (GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+    if (GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
     {
         DecrementCallScope();
 
-        auto trim_drawcalls_command_sets =
-            GetCommandListsForTrimDrawcalls(wrapper, format::ApiCall_ID3D12GraphicsCommandList_ExecuteBundle);
+        auto trim_draw_calls_command_sets =
+            GetCommandListsForTrimDrawCalls(wrapper, format::ApiCall_ID3D12GraphicsCommandList_ExecuteBundle);
 
-        if (trim_drawcalls_command_sets.size() == 3)
+        if (trim_draw_calls_command_sets.size() == 3)
         {
-            // Here is the target drawcall for trim drawcalls.
+            // Here is the target draw call for trim draw calls.
             ID3D12GraphicsCommandList_Wrapper* bunlde_wrapper = nullptr;
             pCommandList->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&bunlde_wrapper));
             GFXRECON_ASSERT(bunlde_wrapper);
@@ -2963,7 +2963,7 @@ void D3D12CaptureManager::OverrideID3D12GraphicsCommandList_ExecuteBundle(ID3D12
             GFXRECON_ASSERT(bundle_info);
 
             uint32_t i = 0;
-            for (auto& command_set : trim_drawcalls_command_sets)
+            for (auto& command_set : trim_draw_calls_command_sets)
             {
                 GFXRECON_ASSERT(bundle_info->split_command_sets[i].list);
 
@@ -2975,10 +2975,10 @@ void D3D12CaptureManager::OverrideID3D12GraphicsCommandList_ExecuteBundle(ID3D12
                 ++i;
             }
         }
-        else if (trim_drawcalls_command_sets.size() == 1)
+        else if (trim_draw_calls_command_sets.size() == 1)
         {
             ID3D12GraphicsCommandList_Wrapper* list_wrapper = nullptr;
-            trim_drawcalls_command_sets[0].list->QueryInterface(IID_IUnknown_Wrapper,
+            trim_draw_calls_command_sets[0].list->QueryInterface(IID_IUnknown_Wrapper,
                                                                 reinterpret_cast<void**>(&list_wrapper));
             GFXRECON_ASSERT(list_wrapper);
             list_wrapper->ExecuteBundle(pCommandList);
@@ -3001,13 +3001,13 @@ void D3D12CaptureManager::OverrideID3D12GraphicsCommandList4_BeginRenderPass(
                                UnwrapStructPtrObjects(pDepthStencil, unwrap_memory),
                                Flags);
 
-    if (GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+    if (GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
     {
         DecrementCallScope();
 
-        auto trim_drawcalls_command_sets =
-            GetCommandListsForTrimDrawcalls(wrapper, format::ApiCall_ID3D12GraphicsCommandList4_BeginRenderPass);
-        if (trim_drawcalls_command_sets.size() == 3)
+        auto trim_draw_calls_command_sets =
+            GetCommandListsForTrimDrawCalls(wrapper, format::ApiCall_ID3D12GraphicsCommandList4_BeginRenderPass);
+        if (trim_draw_calls_command_sets.size() == 3)
         {
             // before
             std::vector<D3D12_RENDER_PASS_RENDER_TARGET_DESC> before_rt_descs;
@@ -3029,7 +3029,7 @@ void D3D12CaptureManager::OverrideID3D12GraphicsCommandList4_BeginRenderPass(
             }
 
             ID3D12GraphicsCommandList4_Wrapper* before4_wrappr = nullptr;
-            trim_drawcalls_command_sets[graphics::dx12::kBeforeDrawCallArrayIndex].list->QueryInterface(
+            trim_draw_calls_command_sets[graphics::dx12::kBeforeDrawCallArrayIndex].list->QueryInterface(
                 IID_IUnknown_Wrapper, reinterpret_cast<void**>(&before4_wrappr));
             GFXRECON_ASSERT(before4_wrappr);
 
@@ -3058,7 +3058,7 @@ void D3D12CaptureManager::OverrideID3D12GraphicsCommandList4_BeginRenderPass(
             }
 
             ID3D12GraphicsCommandList4_Wrapper* target4_wrapper = nullptr;
-            trim_drawcalls_command_sets[graphics::dx12::kDrawCallArrayIndex].list->QueryInterface(
+            trim_draw_calls_command_sets[graphics::dx12::kDrawCallArrayIndex].list->QueryInterface(
                 IID_IUnknown_Wrapper, reinterpret_cast<void**>(&target4_wrapper));
             GFXRECON_ASSERT(target4_wrapper);
 
@@ -3084,16 +3084,16 @@ void D3D12CaptureManager::OverrideID3D12GraphicsCommandList4_BeginRenderPass(
             }
 
             ID3D12GraphicsCommandList4_Wrapper* after4_wrapper = nullptr;
-            trim_drawcalls_command_sets[graphics::dx12::kAfterDrawCallArrayIndex].list->QueryInterface(
+            trim_draw_calls_command_sets[graphics::dx12::kAfterDrawCallArrayIndex].list->QueryInterface(
                 IID_IUnknown_Wrapper, reinterpret_cast<void**>(&after4_wrapper));
             GFXRECON_ASSERT(after4_wrapper);
 
             after4_wrapper->BeginRenderPass(NumRenderTargets, after_rt_descs.data(), p_after_ds_desc, Flags);
         }
-        else if (trim_drawcalls_command_sets.size() == 1)
+        else if (trim_draw_calls_command_sets.size() == 1)
         {
             ID3D12GraphicsCommandList4_Wrapper* list4_wrapper = nullptr;
-            trim_drawcalls_command_sets[0].list->QueryInterface(IID_IUnknown_Wrapper,
+            trim_draw_calls_command_sets[0].list->QueryInterface(IID_IUnknown_Wrapper,
                                                                 reinterpret_cast<void**>(&list4_wrapper));
             GFXRECON_ASSERT(list4_wrapper);
             list4_wrapper->BeginRenderPass(NumRenderTargets, pRenderTargets, pDepthStencil, Flags);
@@ -3321,21 +3321,21 @@ void D3D12CaptureManager::UpdateSwapChainSize(uint32_t width, uint32_t height, I
 }
 
 // It does something similar to Dx12DumpResources::GetCommandListsForDumpResources, but a bit different.
-// Trimming drawcalls is not like dump resources that could browse the captured file to find target commandlist and
-// drawcall before replay.
+// Trimming draw calls is not like dump resources that could browse the captured file to find target commandlist and
+// draw call before replay.
 //
-// For trimming drawcalls, it doesn't know the target commandlist until running the target ExecuteCommandLists.
+// For trimming draw calls, it doesn't know the target commandlist until running the target ExecuteCommandLists.
 // In this case, it assumes every commandlist could be the target commandlist.
 // Every commandlist has three splitted commandlists and add command to the splitted commandlists.
 //
-// It also can't know which drawcall is the target in advance, commandlist has a drawcall_count to count it.
-// Splitted commandlists will add some redundant commands since it couldn't know the target drawcall in advance,
+// It also can't know which draw call is the target in advance, commandlist has a draw_call_count to count it.
+// Splitted commandlists will add some redundant commands since it couldn't know the target draw call in advance,
 // But it shouldn't affect the result and performance.
 //
 // Another different with Dx12DumpResources::GetCommandListsForDumpResources is that the draw calls could be a range.
 // It needs to take care of more about kDrawCall.
 std::vector<graphics::dx12::CommandSet>
-D3D12CaptureManager::GetCommandListsForTrimDrawcalls(ID3D12CommandList_Wrapper* wrapper, format::ApiCallId api_call_id)
+D3D12CaptureManager::GetCommandListsForTrimDrawCalls(ID3D12CommandList_Wrapper* wrapper, format::ApiCallId api_call_id)
 {
     std::vector<graphics::dx12::CommandSet> cmd_sets;
     auto                                    cmd_list_info = wrapper->GetObjectInfo();
@@ -3346,10 +3346,10 @@ D3D12CaptureManager::GetCommandListsForTrimDrawcalls(ID3D12CommandList_Wrapper*
         return cmd_sets;
     }
 
-    auto                               trim_boundary  = GetTrimBundary();
-    CaptureSettings::TrimDrawcalls     trim_drawcalls = GetTrimDrawcalls();
-    graphics::dx12::ID3D12DeviceComPtr device         = nullptr;
-    HRESULT                            ret            = wrapper->GetDevice(IID_PPV_ARGS(&device));
+    auto                               trim_boundary   = GetTrimBoundary();
+    CaptureSettings::TrimDrawCalls     trim_draw_calls = GetTrimDrawCalls();
+    graphics::dx12::ID3D12DeviceComPtr device          = nullptr;
+    HRESULT                            ret             = wrapper->GetDevice(IID_PPV_ARGS(&device));
     GFXRECON_ASSERT(SUCCEEDED(ret));
 
     ID3D12Device_Wrapper* device_wrapper = nullptr;
@@ -3374,37 +3374,37 @@ D3D12CaptureManager::GetCommandListsForTrimDrawcalls(ID3D12CommandList_Wrapper*
 
     graphics::dx12::Dx12DumpResourcePos split_type = graphics::dx12::Dx12DumpResourcePos::kBeforeDrawCall;
 
-    // drawcall_count is added at PostProcess of drawcalls
-    // This function is in Override functions, so the drawcall_count is added after this function.
-    // For example, if target drawcall index is 1, it will be in the end of drawcall_count: 1.
-    // In this case, for "kBeforeDrawCall", the drawcall_count is 0 and 1.
-    // for "kAfterDrawCall", the drawcall_count is larger than 2.
-    // for "kDrawCall", it only happens if the drawcall is a range.
+    // draw_call_count is added at PostProcess of draw calls
+    // This function is in Override functions, so the draw_call_count is added after this function.
+    // For example, if target draw_call index is 1, it will be in the end of draw_call_count: 1.
+    // In this case, for "kBeforeDrawCall", the draw_call_count is 0 and 1.
+    // for "kAfterDrawCall", the draw_call_count is larger than 2.
+    // for "kDrawCall", it only happens if the draw call is a range.
     //
-    // If target drawcall index is a range: 1-2,
-    // In this case, for "kBeforeDrawCall", the drawcall_count is 0 and 1.
-    // for "kAfterDrawCall", the drawcall_count is larger than 3.
-    // for "kDrawCall",  the drawcall_count is 2.
+    // If target draw call index is a range: 1-2,
+    // In this case, for "kBeforeDrawCall", the draw_call_count is 0 and 1.
+    // for "kAfterDrawCall", the draw_call_count is larger than 3.
+    // for "kDrawCall",  the draw_call_count is 2.
     if (cmd_list_info->command_list_type == D3D12_COMMAND_LIST_TYPE_BUNDLE)
     {
-        if ((cmd_list_info->drawcall_count > trim_drawcalls.bundle_drawcall_indices.first) &&
-            (cmd_list_info->drawcall_count <= trim_drawcalls.bundle_drawcall_indices.last))
+        if ((cmd_list_info->draw_call_count > trim_draw_calls.bundle_draw_call_indices.first) &&
+            (cmd_list_info->draw_call_count <= trim_draw_calls.bundle_draw_call_indices.last))
         {
             split_type = graphics::dx12::Dx12DumpResourcePos::kDrawCall;
         }
-        else if (cmd_list_info->drawcall_count > trim_drawcalls.bundle_drawcall_indices.last)
+        else if (cmd_list_info->draw_call_count > trim_draw_calls.bundle_draw_call_indices.last)
         {
             split_type = graphics::dx12::Dx12DumpResourcePos::kAfterDrawCall;
         }
     }
     else
     {
-        if ((cmd_list_info->drawcall_count > trim_drawcalls.drawcall_indices.first) &&
-            (cmd_list_info->drawcall_count <= trim_drawcalls.drawcall_indices.last))
+        if ((cmd_list_info->draw_call_count > trim_draw_calls.draw_call_indices.first) &&
+            (cmd_list_info->draw_call_count <= trim_draw_calls.draw_call_indices.last))
         {
             split_type = graphics::dx12::Dx12DumpResourcePos::kDrawCall;
         }
-        else if (cmd_list_info->drawcall_count > trim_drawcalls.drawcall_indices.last)
+        else if (cmd_list_info->draw_call_count > trim_draw_calls.draw_call_indices.last)
         {
             split_type = graphics::dx12::Dx12DumpResourcePos::kAfterDrawCall;
         }
@@ -3487,12 +3487,12 @@ D3D12CaptureManager::GetCommandListsForTrimDrawcalls(ID3D12CommandList_Wrapper*
             {
                 case graphics::dx12::Dx12DumpResourcePos::kBeforeDrawCall:
                 case graphics::dx12::Dx12DumpResourcePos::kDrawCall:
-                    // If the target drawcall is a bundle, the bundle commandlist will also be splitted into three
+                    // If the target draw call is a bundle, the bundle commandlist will also be splitted into three
                     // commandlists. Then before-commandlist->ExecuteBundle(bundle-before-commandlist)
                     //      target-commandlist->ExecuteBundle(bundle-target-commandlist)
                     //       after-commandlist->ExecuteBundle(bundle-after-commandlist)
-                    // In this case, if the drawcall is these three splitted commandlists need all setup before the
-                    // target drawcall. But it can't know if the target drawcall is a bundle in advance, so just add
+                    // In this case, if the draw call is these three splitted commandlists need all setup before the
+                    // target draw call. But it can't know if the target draw call is a bundle in advance, so just add
                     // all setup into all splitted commandlists.
                     cmd_sets.insert(cmd_sets.end(),
                                     cmd_list_info->split_command_sets.begin(),
@@ -3511,7 +3511,7 @@ D3D12CaptureManager::GetCommandListsForTrimDrawcalls(ID3D12CommandList_Wrapper*
             switch (split_type)
             {
                 case graphics::dx12::Dx12DumpResourcePos::kBeforeDrawCall:
-                    if (cmd_list_info->drawcall_count == trim_drawcalls.drawcall_indices.first)
+                    if (cmd_list_info->draw_call_count == trim_draw_calls.draw_call_indices.first)
                     {
                         // Target ExecuteBundle.
                         cmd_sets.insert(cmd_sets.end(),
@@ -3538,9 +3538,9 @@ D3D12CaptureManager::GetCommandListsForTrimDrawcalls(ID3D12CommandList_Wrapper*
         case format::ApiCall_ID3D12GraphicsCommandList_Dispatch:
         case format::ApiCall_ID3D12GraphicsCommandList_ExecuteIndirect:
         {
-            if (cmd_list_info->drawcall_count == trim_drawcalls.drawcall_indices.first)
+            if (cmd_list_info->draw_call_count == trim_draw_calls.draw_call_indices.first)
             {
-                // Target drawcall.
+                // Target draw call.
                 cmd_sets.emplace_back(cmd_list_info->split_command_sets[graphics::dx12::kDrawCallArrayIndex]);
             }
             else
diff --git a/framework/encode/d3d12_capture_manager.h b/framework/encode/d3d12_capture_manager.h
index 4b075422e2..a4cb0d8d99 100644
--- a/framework/encode/d3d12_capture_manager.h
+++ b/framework/encode/d3d12_capture_manager.h
@@ -806,7 +806,7 @@ class D3D12CaptureManager : public ApiCaptureManager
 
     int GetAgsVersion() { return ags_version_; }
 
-    std::vector<graphics::dx12::CommandSet> GetCommandListsForTrimDrawcalls(ID3D12CommandList_Wrapper* wrapper,
+    std::vector<graphics::dx12::CommandSet> GetCommandListsForTrimDrawCalls(ID3D12CommandList_Wrapper* wrapper,
                                                                             format::ApiCallId          api_call_id);
 
   protected:
diff --git a/framework/encode/dx12_object_wrapper_info.h b/framework/encode/dx12_object_wrapper_info.h
index 1ba38f6c89..cf79cd7a98 100644
--- a/framework/encode/dx12_object_wrapper_info.h
+++ b/framework/encode/dx12_object_wrapper_info.h
@@ -476,9 +476,9 @@ struct ID3D12CommandListInfo : public DxWrapperInfo
     std::vector<DxAccelerationStructureBuildInfo> acceleration_structure_builds;
     std::vector<DxAccelerationStructureCopyInfo>  acceleration_structure_copies;
 
-    uint32_t drawcall_count{ 0 }; // DrawInstanced, DrawIndexedInstanced, Dispatch, ExecuteIndirect, ExecuteBundle
+    uint32_t draw_call_count{ 0 }; // DrawInstanced, DrawIndexedInstanced, Dispatch, ExecuteIndirect, ExecuteBundle
 
-    // GFXRECON_CAPTURE_DRAWCALLS
+    // GFXRECON_CAPTURE_DRAW_CALLS
     std::array<graphics::dx12::CommandSet, 3> split_command_sets;
     bool                                      is_split_commandlist{ false };
 };
diff --git a/framework/encode/dx12_state_tracker.cpp b/framework/encode/dx12_state_tracker.cpp
index 4b886d2b8f..ce9eb54d49 100644
--- a/framework/encode/dx12_state_tracker.cpp
+++ b/framework/encode/dx12_state_tracker.cpp
@@ -133,7 +133,7 @@ void Dx12StateTracker::TrackCommandExecution(ID3D12CommandList_Wrapper*      lis
         list_info->command_cpu_descriptor_handles.clear();
         list_info->command_gpu_descriptor_handles.clear();
         list_info->command_gpu_virtual_addresses.clear();
-        list_info->drawcall_count = 0;
+        list_info->draw_call_count = 0;
 
         for (size_t i = 0; i < D3D12GraphicsCommandObjectType::NumObjectTypes; ++i)
         {
diff --git a/framework/generated/dx12_generators/dx12_wrapper_body_generator.py b/framework/generated/dx12_generators/dx12_wrapper_body_generator.py
index 0973994319..71fe89304d 100644
--- a/framework/generated/dx12_generators/dx12_wrapper_body_generator.py
+++ b/framework/generated/dx12_generators/dx12_wrapper_body_generator.py
@@ -710,8 +710,8 @@ def write_class_member_def(self, class_info, indent=''):
 
             wrapped_args = ''
             unwrapped_args = ''
-            trim_drawcalls_wrapped_args = ''
-            trim_drawcalls_unwrapped_args = ''
+            trim_draw_calls_wrapped_args = ''
+            trim_draw_calls_unwrapped_args = ''
             need_unwrap_memory = False
             if parameters:
                 wrapped_args, unused = self.make_arg_list(
@@ -720,10 +720,10 @@ def write_class_member_def(self, class_info, indent=''):
                 unwrapped_args, need_unwrap_memory = self.make_arg_list(
                     parameters, True, self.increment_indent(indent)
                 )
-                trim_drawcalls_wrapped_args, unused = self.make_arg_list(
+                trim_draw_calls_wrapped_args, unused = self.make_arg_list(
                     parameters, False, self.increment_indent(self.increment_indent(self.increment_indent(indent)))
                 )
-                trim_drawcalls_unwrapped_args, need_unwrap_memory = self.make_arg_list(
+                trim_draw_calls_unwrapped_args, need_unwrap_memory = self.make_arg_list(
                     parameters, True, self.increment_indent(self.increment_indent(self.increment_indent(indent)))
                 )
 
@@ -789,11 +789,11 @@ def write_class_member_def(self, class_info, indent=''):
                 indent3 = self.increment_indent(indent2)
                 indent4 = self.increment_indent(indent3)
                 expr += '\n'
-                expr += indent + 'if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)\n'
+                expr += indent + 'if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)\n'
                 expr += indent + '{\n'
                 expr += indent1 + 'manager->DecrementCallScope();\n'
-                expr += indent1 + 'auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_{}_{});\n'.format(class_name, method_name)
-                expr += indent1 + 'for(auto& command_set : trim_drawcalls_command_sets)\n'
+                expr += indent1 + 'auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_{}_{});\n'.format(class_name, method_name)
+                expr += indent1 + 'for(auto& command_set : trim_draw_calls_command_sets)\n'
                 expr += indent1 + '{\n'
 
                 if class_name != 'ID3D12GraphicsCommandList':
@@ -806,22 +806,22 @@ def write_class_member_def(self, class_info, indent=''):
                     expr += indent2 + 'command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));\n'
 
                 if return_type != 'void':
-                    expr += indent2 + 'HRESULT result_trim_drawcalls = wrapper'
+                    expr += indent2 + 'HRESULT result_trim_draw_calls = wrapper'
                 else:
                     expr += indent2 + 'wrapper'
 
                 expr += "->{}(".format(method_name)                
-                if trim_drawcalls_wrapped_args:
+                if trim_draw_calls_wrapped_args:
                     expr += "\n"
-                    expr += trim_drawcalls_wrapped_args
+                    expr += trim_draw_calls_wrapped_args
                 expr += ");\n"
 
                 if return_type != 'void':               
-                    expr += indent2 + 'if (result != result_trim_drawcalls)\n'
+                    expr += indent2 + 'if (result != result_trim_draw_calls)\n'
                     expr += indent2 + '{\n'
                     expr += indent3 + 'GFXRECON_LOG_WARNING("Splitting commandlists of {}::{} get different results: %s and %s",\n'.format(class_name, method_name)
                     expr += indent4 + 'decode::enumutil::GetResultValueString(result).c_str(),\n'
-                    expr += indent4 + 'decode::enumutil::GetResultValueString(result_trim_drawcalls).c_str());\n'
+                    expr += indent4 + 'decode::enumutil::GetResultValueString(result_trim_draw_calls).c_str());\n'
                     expr += indent2 + '}\n'
 
                 expr += indent1 + '}\n'
diff --git a/framework/generated/generated_dx12_wrappers.cpp b/framework/generated/generated_dx12_wrappers.cpp
index 2d66dff1df..53e641ff04 100644
--- a/framework/generated/generated_dx12_wrappers.cpp
+++ b/framework/generated/generated_dx12_wrappers.cpp
@@ -11697,20 +11697,20 @@ HRESULT STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::Close()
             this,
             result);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_Close);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_Close);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
-                HRESULT result_trim_drawcalls = wrapper->Close();
-                if (result != result_trim_drawcalls)
+                HRESULT result_trim_draw_calls = wrapper->Close();
+                if (result != result_trim_draw_calls)
                 {
                     GFXRECON_LOG_WARNING("Splitting commandlists of ID3D12GraphicsCommandList::Close get different results: %s and %s",
                         decode::enumutil::GetResultValueString(result).c_str(),
-                        decode::enumutil::GetResultValueString(result_trim_drawcalls).c_str());
+                        decode::enumutil::GetResultValueString(result_trim_draw_calls).c_str());
                 }
             }
             manager->IncrementCallScope();
@@ -11822,11 +11822,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::ClearState(
             this,
             pPipelineState);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_ClearState);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_ClearState);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -11894,11 +11894,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::DrawInstanced(
             StartVertexLocation,
             StartInstanceLocation);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_DrawInstanced);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_DrawInstanced);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -11979,11 +11979,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::DrawIndexedInstanced(
             BaseVertexLocation,
             StartInstanceLocation);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_DrawIndexedInstanced);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_DrawIndexedInstanced);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -12059,11 +12059,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::Dispatch(
             ThreadGroupCountY,
             ThreadGroupCountZ);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_Dispatch);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_Dispatch);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -12141,11 +12141,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::CopyBufferRegion(
             SrcOffset,
             NumBytes);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_CopyBufferRegion);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_CopyBufferRegion);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -12235,11 +12235,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::CopyTextureRegion(
             pSrc,
             pSrcBox);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_CopyTextureRegion);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_CopyTextureRegion);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -12314,11 +12314,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::CopyResource(
             pDstResource,
             pSrcResource);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_CopyResource);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_CopyResource);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -12397,11 +12397,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::CopyTiles(
             BufferStartOffsetInBytes,
             Flags);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_CopyTiles);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_CopyTiles);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -12488,11 +12488,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::ResolveSubresource(
             SrcSubresource,
             Format);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_ResolveSubresource);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_ResolveSubresource);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -12560,11 +12560,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::IASetPrimitiveTopology
             this,
             PrimitiveTopology);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_IASetPrimitiveTopology);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_IASetPrimitiveTopology);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -12624,11 +12624,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::RSSetViewports(
             NumViewports,
             pViewports);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_RSSetViewports);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_RSSetViewports);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -12691,11 +12691,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::RSSetScissorRects(
             NumRects,
             pRects);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_RSSetScissorRects);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_RSSetScissorRects);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -12754,11 +12754,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::OMSetBlendFactor(
             this,
             BlendFactor);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_OMSetBlendFactor);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_OMSetBlendFactor);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -12814,11 +12814,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::OMSetStencilRef(
             this,
             StencilRef);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_OMSetStencilRef);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_OMSetStencilRef);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -12874,11 +12874,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::SetPipelineState(
             this,
             pPipelineState);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetPipelineState);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetPipelineState);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -12940,11 +12940,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::ResourceBarrier(
             NumBarriers,
             pBarriers);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_ResourceBarrier);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_ResourceBarrier);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -13056,11 +13056,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::SetDescriptorHeaps(
             NumDescriptorHeaps,
             ppDescriptorHeaps);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetDescriptorHeaps);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetDescriptorHeaps);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -13119,11 +13119,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::SetComputeRootSignatur
             this,
             pRootSignature);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetComputeRootSignature);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetComputeRootSignature);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -13179,11 +13179,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::SetGraphicsRootSignatu
             this,
             pRootSignature);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetGraphicsRootSignature);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetGraphicsRootSignature);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -13245,11 +13245,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::SetComputeRootDescript
             RootParameterIndex,
             BaseDescriptor);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetComputeRootDescriptorTable);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetComputeRootDescriptorTable);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -13314,11 +13314,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::SetGraphicsRootDescrip
             RootParameterIndex,
             BaseDescriptor);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -13385,11 +13385,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::SetComputeRoot32BitCon
             SrcData,
             DestOffsetIn32BitValues);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetComputeRoot32BitConstant);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetComputeRoot32BitConstant);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -13459,11 +13459,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::SetGraphicsRoot32BitCo
             SrcData,
             DestOffsetIn32BitValues);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstant);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstant);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -13537,11 +13537,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::SetComputeRoot32BitCon
             pSrcData,
             DestOffsetIn32BitValues);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetComputeRoot32BitConstants);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetComputeRoot32BitConstants);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -13618,11 +13618,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::SetGraphicsRoot32BitCo
             pSrcData,
             DestOffsetIn32BitValues);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -13693,11 +13693,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::SetComputeRootConstant
             RootParameterIndex,
             BufferLocation);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetComputeRootConstantBufferView);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetComputeRootConstantBufferView);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -13762,11 +13762,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::SetGraphicsRootConstan
             RootParameterIndex,
             BufferLocation);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -13831,11 +13831,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::SetComputeRootShaderRe
             RootParameterIndex,
             BufferLocation);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetComputeRootShaderResourceView);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetComputeRootShaderResourceView);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -13900,11 +13900,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::SetGraphicsRootShaderR
             RootParameterIndex,
             BufferLocation);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetGraphicsRootShaderResourceView);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetGraphicsRootShaderResourceView);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -13969,11 +13969,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::SetComputeRootUnordere
             RootParameterIndex,
             BufferLocation);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetComputeRootUnorderedAccessView);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetComputeRootUnorderedAccessView);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -14038,11 +14038,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::SetGraphicsRootUnorder
             RootParameterIndex,
             BufferLocation);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetGraphicsRootUnorderedAccessView);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetGraphicsRootUnorderedAccessView);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -14108,11 +14108,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::IASetIndexBuffer(
             this,
             pView);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_IASetIndexBuffer);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_IASetIndexBuffer);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -14183,11 +14183,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::IASetVertexBuffers(
             NumViews,
             pViews);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_IASetVertexBuffers);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_IASetVertexBuffers);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -14264,11 +14264,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::SOSetTargets(
             NumViews,
             pViews);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_SOSetTargets);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_SOSetTargets);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -14344,11 +14344,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::OMSetRenderTargets(
             RTsSingleHandleToDescriptorRange,
             pDepthStencilDescriptor);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_OMSetRenderTargets);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_OMSetRenderTargets);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -14435,11 +14435,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::ClearDepthStencilView(
             NumRects,
             pRects);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_ClearDepthStencilView);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_ClearDepthStencilView);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -14524,11 +14524,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::ClearRenderTargetView(
             NumRects,
             pRects);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_ClearRenderTargetView);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_ClearRenderTargetView);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -14617,11 +14617,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::ClearUnorderedAccessVi
             NumRects,
             pRects);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_ClearUnorderedAccessViewUint);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_ClearUnorderedAccessViewUint);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -14716,11 +14716,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::ClearUnorderedAccessVi
             NumRects,
             pRects);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_ClearUnorderedAccessViewFloat);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_ClearUnorderedAccessViewFloat);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -14795,11 +14795,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::DiscardResource(
             pResource,
             pRegion);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_DiscardResource);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_DiscardResource);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -14866,11 +14866,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::BeginQuery(
             Type,
             Index);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_BeginQuery);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_BeginQuery);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -14940,11 +14940,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::EndQuery(
             Type,
             Index);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_EndQuery);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_EndQuery);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -15026,11 +15026,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::ResolveQueryData(
             pDestinationBuffer,
             AlignedDestinationBufferOffset);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_ResolveQueryData);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_ResolveQueryData);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -15109,11 +15109,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::SetPredication(
             AlignedBufferOffset,
             Operation);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetPredication);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetPredication);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -15183,11 +15183,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::SetMarker(
             pData,
             Size);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetMarker);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_SetMarker);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -15257,11 +15257,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::BeginEvent(
             pData,
             Size);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_BeginEvent);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_BeginEvent);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -15319,11 +15319,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::EndEvent()
         Encode_ID3D12GraphicsCommandList_EndEvent(
             this);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_EndEvent);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_EndEvent);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -15396,11 +15396,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList_Wrapper::ExecuteIndirect(
             pCountBuffer,
             CountBufferOffset);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList_ExecuteIndirect);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList_ExecuteIndirect);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;
                 command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));
@@ -15501,11 +15501,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList1_Wrapper::AtomicCopyBufferUINT(
             ppDependentResources,
             pDependentSubresourceRanges);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList1_AtomicCopyBufferUINT);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList1_AtomicCopyBufferUINT);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList1* command_list;
                 command_set.list->QueryInterface(IID_PPV_ARGS(&command_list));
@@ -15607,11 +15607,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList1_Wrapper::AtomicCopyBufferUINT6
             ppDependentResources,
             pDependentSubresourceRanges);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList1_AtomicCopyBufferUINT64);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList1_AtomicCopyBufferUINT64);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList1* command_list;
                 command_set.list->QueryInterface(IID_PPV_ARGS(&command_list));
@@ -15691,11 +15691,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList1_Wrapper::OMSetDepthBounds(
             Min,
             Max);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList1_OMSetDepthBounds);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList1_OMSetDepthBounds);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList1* command_list;
                 command_set.list->QueryInterface(IID_PPV_ARGS(&command_list));
@@ -15764,11 +15764,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList1_Wrapper::SetSamplePositions(
             NumPixels,
             pSamplePositions);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList1_SetSamplePositions);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList1_SetSamplePositions);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList1* command_list;
                 command_set.list->QueryInterface(IID_PPV_ARGS(&command_list));
@@ -15864,11 +15864,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList1_Wrapper::ResolveSubresourceReg
             Format,
             ResolveMode);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList1_ResolveSubresourceRegion);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList1_ResolveSubresourceRegion);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList1* command_list;
                 command_set.list->QueryInterface(IID_PPV_ARGS(&command_list));
@@ -15950,11 +15950,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList1_Wrapper::SetViewInstanceMask(
             this,
             Mask);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList1_SetViewInstanceMask);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList1_SetViewInstanceMask);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList1* command_list;
                 command_set.list->QueryInterface(IID_PPV_ARGS(&command_list));
@@ -16031,11 +16031,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList2_Wrapper::WriteBufferImmediate(
             pParams,
             pModes);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList2_WriteBufferImmediate);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList2_WriteBufferImmediate);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList2* command_list;
                 command_set.list->QueryInterface(IID_PPV_ARGS(&command_list));
@@ -23563,11 +23563,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList3_Wrapper::SetProtectedResourceS
             this,
             pProtectedResourceSession);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList3_SetProtectedResourceSession);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList3_SetProtectedResourceSession);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList3* command_list;
                 command_set.list->QueryInterface(IID_PPV_ARGS(&command_list));
@@ -23770,11 +23770,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList4_Wrapper::EndRenderPass()
         Encode_ID3D12GraphicsCommandList4_EndRenderPass(
             this);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList4_EndRenderPass);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList4_EndRenderPass);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList4* command_list;
                 command_set.list->QueryInterface(IID_PPV_ARGS(&command_list));
@@ -23837,11 +23837,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList4_Wrapper::InitializeMetaCommand
             pInitializationParametersData,
             InitializationParametersDataSizeInBytes);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList4_InitializeMetaCommand);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList4_InitializeMetaCommand);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList4* command_list;
                 command_set.list->QueryInterface(IID_PPV_ARGS(&command_list));
@@ -23913,11 +23913,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList4_Wrapper::ExecuteMetaCommand(
             pExecutionParametersData,
             ExecutionParametersDataSizeInBytes);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList4_ExecuteMetaCommand);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList4_ExecuteMetaCommand);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList4* command_list;
                 command_set.list->QueryInterface(IID_PPV_ARGS(&command_list));
@@ -24004,11 +24004,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList4_Wrapper::BuildRaytracingAccele
             NumPostbuildInfoDescs,
             pPostbuildInfoDescs);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList4_BuildRaytracingAccelerationStructure);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList4_BuildRaytracingAccelerationStructure);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList4* command_list;
                 command_set.list->QueryInterface(IID_PPV_ARGS(&command_list));
@@ -24094,11 +24094,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList4_Wrapper::EmitRaytracingAcceler
             NumSourceAccelerationStructures,
             pSourceAccelerationStructureData);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList4_EmitRaytracingAccelerationStructurePostbuildInfo);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList4_EmitRaytracingAccelerationStructurePostbuildInfo);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList4* command_list;
                 command_set.list->QueryInterface(IID_PPV_ARGS(&command_list));
@@ -24174,11 +24174,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList4_Wrapper::CopyRaytracingAcceler
             SourceAccelerationStructureData,
             Mode);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList4_CopyRaytracingAccelerationStructure);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList4_CopyRaytracingAccelerationStructure);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList4* command_list;
                 command_set.list->QueryInterface(IID_PPV_ARGS(&command_list));
@@ -24242,11 +24242,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList4_Wrapper::SetPipelineState1(
             this,
             pStateObject);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList4_SetPipelineState1);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList4_SetPipelineState1);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList4* command_list;
                 command_set.list->QueryInterface(IID_PPV_ARGS(&command_list));
@@ -24311,11 +24311,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList4_Wrapper::DispatchRays(
             this,
             pDesc);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList4_DispatchRays);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList4_DispatchRays);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList4* command_list;
                 command_set.list->QueryInterface(IID_PPV_ARGS(&command_list));
@@ -26441,11 +26441,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList5_Wrapper::RSSetShadingRate(
             baseShadingRate,
             combiners);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList5_RSSetShadingRate);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList5_RSSetShadingRate);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList5* command_list;
                 command_set.list->QueryInterface(IID_PPV_ARGS(&command_list));
@@ -26506,11 +26506,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList5_Wrapper::RSSetShadingRateImage
             this,
             shadingRateImage);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList5_RSSetShadingRateImage);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList5_RSSetShadingRateImage);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList5* command_list;
                 command_set.list->QueryInterface(IID_PPV_ARGS(&command_list));
@@ -26580,11 +26580,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList6_Wrapper::DispatchMesh(
             ThreadGroupCountY,
             ThreadGroupCountZ);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList6_DispatchMesh);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList6_DispatchMesh);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList6* command_list;
                 command_set.list->QueryInterface(IID_PPV_ARGS(&command_list));
@@ -26658,11 +26658,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList7_Wrapper::Barrier(
             NumBarrierGroups,
             pBarrierGroups);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList7_Barrier);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList7_Barrier);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList7* command_list;
                 command_set.list->QueryInterface(IID_PPV_ARGS(&command_list));
@@ -26731,11 +26731,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList8_Wrapper::OMSetFrontAndBackSten
             FrontStencilRef,
             BackStencilRef);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList8_OMSetFrontAndBackStencilRef);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList8_OMSetFrontAndBackStencilRef);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList8* command_list;
                 command_set.list->QueryInterface(IID_PPV_ARGS(&command_list));
@@ -26808,11 +26808,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList9_Wrapper::RSSetDepthBias(
             DepthBiasClamp,
             SlopeScaledDepthBias);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList9_RSSetDepthBias);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList9_RSSetDepthBias);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList9* command_list;
                 command_set.list->QueryInterface(IID_PPV_ARGS(&command_list));
@@ -26876,11 +26876,11 @@ void STDMETHODCALLTYPE ID3D12GraphicsCommandList9_Wrapper::IASetIndexBufferStrip
             this,
             IBStripCutValue);
 
-        if(manager->GetTrimBundary() == CaptureSettings::TrimBoundary::kDrawcalls)
+        if(manager->GetTrimBoundary() == CaptureSettings::TrimBoundary::kDrawCalls)
         {
             manager->DecrementCallScope();
-            auto trim_drawcalls_command_sets = manager->GetCommandListsForTrimDrawcalls(this, format::ApiCall_ID3D12GraphicsCommandList9_IASetIndexBufferStripCutValue);
-            for(auto& command_set : trim_drawcalls_command_sets)
+            auto trim_draw_calls_command_sets = manager->GetCommandListsForTrimDrawCalls(this, format::ApiCall_ID3D12GraphicsCommandList9_IASetIndexBufferStripCutValue);
+            for(auto& command_set : trim_draw_calls_command_sets)
             {
                 ID3D12GraphicsCommandList9* command_list;
                 command_set.list->QueryInterface(IID_PPV_ARGS(&command_list));
diff --git a/tools/replay/desktop_main.cpp b/tools/replay/desktop_main.cpp
index 958382026c..2edf04ea27 100644
--- a/tools/replay/desktop_main.cpp
+++ b/tools/replay/desktop_main.cpp
@@ -91,9 +91,9 @@ const char kLayerEnvVar[] = "VK_INSTANCE_LAYERS";
 #if defined(D3D12_SUPPORT)
 bool BrowseFile(const std::string&                           input_filename,
                 const gfxrecon::decode::DumpResourcesTarget& dump_resources_target,
-                gfxrecon::decode::TrackDumpDrawcall&         out_track_dump_target)
+                gfxrecon::decode::TrackDumpDrawCall&         out_track_dump_target)
 {
-    gfxrecon::decode::TrackDumpDrawcall* track_dump_target = nullptr;
+    gfxrecon::decode::TrackDumpDrawCall* track_dump_target = nullptr;
 
     gfxrecon::decode::FileProcessor file_processor;
     if (file_processor.Initialize(input_filename))
@@ -239,7 +239,7 @@ int main(int argc, const char** argv)
 
             if (dx_replay_options.enable_dump_resources)
             {
-                gfxrecon::decode::TrackDumpDrawcall track_dump_target;
+                gfxrecon::decode::TrackDumpDrawCall track_dump_target;
                 BrowseFile(filename, dx_replay_options.dump_resources_target, track_dump_target);
                 dx12_replay_consumer.SetDumpTarget(track_dump_target);
             }
diff --git a/tools/tool_settings.h b/tools/tool_settings.h
index cad78bcc20..0557f84ebb 100644
--- a/tools/tool_settings.h
+++ b/tools/tool_settings.h
@@ -1139,10 +1139,10 @@ static gfxrecon::decode::DxReplayOptions GetDxReplayOptions(const gfxrecon::util
         std::vector<std::string> values = gfxrecon::util::strings::SplitString(dump_resources, ',');
         if (values.size() == 3)
         {
-            replay_options.dump_resources_target.submit_index   = std::stoi(values[0]);
-            replay_options.dump_resources_target.command_index  = std::stoi(values[1]);
-            replay_options.dump_resources_target.drawcall_index = std::stoi(values[2]);
-            replay_options.enable_dump_resources                = true;
+            replay_options.dump_resources_target.submit_index    = std::stoi(values[0]);
+            replay_options.dump_resources_target.command_index   = std::stoi(values[1]);
+            replay_options.dump_resources_target.draw_call_index = std::stoi(values[2]);
+            replay_options.enable_dump_resources                 = true;
         }
     }