diff --git a/editor/src/Viewport/SceneViewportRenderPlan.h b/editor/src/Viewport/SceneViewportRenderPlan.h
index 83645ff5..fd8d987f 100644
--- a/editor/src/Viewport/SceneViewportRenderPlan.h
+++ b/editor/src/Viewport/SceneViewportRenderPlan.h
@@ -101,18 +101,18 @@ inline SceneViewportRenderPlanBuildResult BuildSceneViewportRenderPlan(
 inline void ApplySceneViewportRenderPlan(
     const ViewportRenderTargets& targets,
     SceneViewportRenderPlan& plan,
-    Rendering::CameraRenderRequest& request) {
+    Rendering::CameraFramePlan& framePlan) {
     ApplySceneViewportRenderRequestSetup(
         targets,
         &plan.postScenePasses,
-        request);
+        framePlan);
 
     if (plan.HasOverlayPasses()) {
-        request.overlayPasses = &plan.overlayPasses;
+        framePlan.overlayPasses = &plan.overlayPasses;
     }
 
-    request.hasClearColorOverride = plan.hasClearColorOverride;
-    request.clearColorOverride = plan.clearColorOverride;
+    framePlan.request.hasClearColorOverride = plan.hasClearColorOverride;
+    framePlan.request.clearColorOverride = plan.clearColorOverride;
 }
 
 } // namespace Editor
diff --git a/editor/src/Viewport/ViewportHostRenderFlowUtils.h b/editor/src/Viewport/ViewportHostRenderFlowUtils.h
index 03696e9a..8b2e714b 100644
--- a/editor/src/Viewport/ViewportHostRenderFlowUtils.h
+++ b/editor/src/Viewport/ViewportHostRenderFlowUtils.h
@@ -5,7 +5,7 @@
 #include "ViewportHostRenderTargets.h"
 
 #include <XCEngine/Core/Math/Color.h>
-#include <XCEngine/Rendering/Planning/CameraRenderRequest.h>
+#include <XCEngine/Rendering/Execution/CameraFramePlan.h>
 
 #include <string>
 #include <vector>
@@ -142,31 +142,31 @@ inline SceneViewportSelectionOutlineStyle BuildSceneViewportSelectionOutlineStyl
 inline void ApplySceneViewportRenderRequestSetup(
     const ViewportRenderTargets& targets,
     Rendering::RenderPassSequence* postPasses,
-    Rendering::CameraRenderRequest& request) {
-    request.preScenePasses = nullptr;
-    request.postScenePasses = nullptr;
-    request.overlayPasses = nullptr;
-    request.objectId = {};
+    Rendering::CameraFramePlan& plan) {
+    plan.preScenePasses = nullptr;
+    plan.postScenePasses = nullptr;
+    plan.overlayPasses = nullptr;
+    plan.request.objectId = {};
 
     if (postPasses != nullptr && postPasses->GetPassCount() > 0) {
-        request.postScenePasses = postPasses;
+        plan.postScenePasses = postPasses;
     }
 
     if (targets.objectIdView == nullptr || targets.objectIdDepthView == nullptr) {
         return;
     }
 
-    request.objectId.surface = BuildViewportObjectIdSurface(targets);
-    request.objectId.surface.SetRenderArea(request.surface.GetRenderArea());
+    plan.request.objectId.surface = BuildViewportObjectIdSurface(targets);
+    plan.request.objectId.surface.SetRenderArea(plan.request.surface.GetRenderArea());
 }
 
 inline void MarkSceneViewportRenderSuccess(
     ViewportRenderTargets& targets,
-    const Rendering::CameraRenderRequest& request) {
+    const Rendering::CameraFramePlan& plan) {
     targets.colorState = RHI::ResourceStates::PixelShaderResource;
     targets.objectIdState = RHI::ResourceStates::PixelShaderResource;
     targets.selectionMaskState = RHI::ResourceStates::PixelShaderResource;
-    targets.hasValidObjectIdFrame = request.objectId.IsRequested();
+    targets.hasValidObjectIdFrame = plan.request.objectId.IsRequested();
 }
 
 inline void MarkGameViewportRenderSuccess(ViewportRenderTargets& targets) {
diff --git a/editor/src/Viewport/ViewportHostService.h b/editor/src/Viewport/ViewportHostService.h
index 76425b0d..ea4cd681 100644
--- a/editor/src/Viewport/ViewportHostService.h
+++ b/editor/src/Viewport/ViewportHostService.h
@@ -591,9 +591,9 @@ private:
         SceneViewportRenderState sceneState = {};
         BuildSceneViewportRenderState(entry, context, sceneState);
 
-        std::vector<Rendering::CameraRenderRequest> requests =
-            m_sceneRenderer->BuildRenderRequests(*scene, m_sceneViewCamera.camera, renderContext, surface);
-        if (requests.empty()) {
+        std::vector<Rendering::CameraFramePlan> plans =
+            m_sceneRenderer->BuildFramePlans(*scene, m_sceneViewCamera.camera, renderContext, surface);
+        if (plans.empty()) {
             ApplyViewportRenderFailure(
                 entry,
                 renderContext,
@@ -602,9 +602,9 @@ private:
             return false;
         }
 
-        ApplySceneViewportRenderPlan(entry.renderTargets, sceneState.renderPlan, requests[0]);
+        ApplySceneViewportRenderPlan(entry.renderTargets, sceneState.renderPlan, plans[0]);
 
-        if (!m_sceneRenderer->Render(requests)) {
+        if (!m_sceneRenderer->Render(plans)) {
             ApplyViewportRenderFailure(
                 entry,
                 renderContext,
@@ -613,7 +613,7 @@ private:
             return false;
         }
 
-        MarkSceneViewportRenderSuccess(entry.renderTargets, requests[0]);
+        MarkSceneViewportRenderSuccess(entry.renderTargets, plans[0]);
         const Core::uint32 pendingAsyncLoads = Resources::ResourceManager::Get().GetAsyncPendingCount();
         context.GetSceneManager().NotifySceneViewportFramePresented(pendingAsyncLoads);
         if (entry.statusText.empty()) {