diff --git a/Machining/DemoMillingByCutterLocation.cs b/Machining/DemoMillingByCutterLocation.cs
index 803fff2..e3432be 100644
--- a/Machining/DemoMillingByCutterLocation.cs
+++ b/Machining/DemoMillingByCutterLocation.cs
@@ -58,7 +58,7 @@ namespace Sample.Machining
 			localProjectService.WorkpieceService.IdealGeom = new StlFile(stlFile_CylinderR19, projectDir);
 			localProjectService.Workpiece.InitResolution = resolution_mm;
 
-			RuntimeApi runtimeApi = localProjectService.RuntimeApi;
+			SessionShell runtimeApi = localProjectService.SessionShell;
 			runtimeApi.SetNcResolutionFixed(9999, 15);
 			runtimeApi.EnableCollisionDetection = false;
 			runtimeApi.EnablePhysics = false;
@@ -111,7 +111,7 @@ namespace Sample.Machining
 		static void RunSession(LocalProjectService localProjectService, double resolution_mm)
 		{
 			var project=localProjectService.MachiningProject;
-			RuntimeApi runtimeApi = localProjectService.RuntimeApi;
+			SessionShell runtimeApi = localProjectService.SessionShell;
 
 			localProjectService.BeginSession();
 			double radius = 20;
diff --git a/Machining/DemoRenderingMachiningProcessAndStripPosSelection.cs b/Machining/DemoRenderingMachiningProcessAndStripPosSelection.cs
index 2612bf7..90ff274 100644
--- a/Machining/DemoRenderingMachiningProcessAndStripPosSelection.cs
+++ b/Machining/DemoRenderingMachiningProcessAndStripPosSelection.cs
@@ -33,7 +33,7 @@ namespace Sample.Machining
 			localProjectService.LoadProject(projectPath);
             MachiningProject machiningProject = localProjectService.MachiningProject;
 
-			localProjectService.RuntimeApi.SessionStepSelected += (MachiningStep step) =>
+			localProjectService.SessionShell.SessionStepSelected += (MachiningStep step) =>
             {
                 var sourceCommand = step.SourceCommand;
                 var indexedFileLine = sourceCommand.GetSentence().FirstIndexedFileLine;