diff --git a/src/components/experiment-workbench/experiment-tools-service.js b/src/components/experiment-workbench/experiment-tools-service.js
index 1d16e533f7f3722ea40880c881adce782605bee0..1f0f9b5d99411b25520ab1af94e7d0296513f367 100644
--- a/src/components/experiment-workbench/experiment-tools-service.js
+++ b/src/components/experiment-workbench/experiment-tools-service.js
@@ -7,22 +7,22 @@ const SINGLETON_ENFORCER = Symbol();
 /**
  * Service handling server resources for simulating experiments.
  */
-class SimulationToolsService {
+class ExperimentToolsService {
   constructor(enforcer) {
     if (enforcer !== SINGLETON_ENFORCER) {
       throw new Error('Use ' + this.constructor.name + '.instance');
     }
 
     this.tools = new Map();
-    for (const toolEntry in SimulationToolsService.TOOLS) {
-      this.registerToolConfig(SimulationToolsService.TOOLS[toolEntry]);
+    for (const toolEntry in ExperimentToolsService.TOOLS) {
+      this.registerToolConfig(ExperimentToolsService.TOOLS[toolEntry]);
     }
     this.registerToolConfig(NrpCoreDashboard.CONSTANTS.TOOL_CONFIG);
   }
 
   static get instance() {
     if (_instance == null) {
-      _instance = new SimulationToolsService(SINGLETON_ENFORCER);
+      _instance = new ExperimentToolsService(SINGLETON_ENFORCER);
     }
 
     return _instance;
@@ -62,7 +62,7 @@ class SimulationToolsService {
   }
 }
 
-SimulationToolsService.TOOLS = Object.freeze({
+ExperimentToolsService.TOOLS = Object.freeze({
   NEST_DESKTOP: {
     singleton: true,
     flexlayoutNode: {
@@ -99,11 +99,11 @@ SimulationToolsService.TOOLS = Object.freeze({
   }
 });
 
-SimulationToolsService.CONSTANTS = Object.freeze({
+ExperimentToolsService.CONSTANTS = Object.freeze({
   CATEGORY: {
     EXTERNAL_IFRAME: 'EXTERNAL_IFRAME',
     REACT_COMPONENT: 'REACT_COMPONENT'
   }
 });
 
-export default SimulationToolsService;
+export default ExperimentToolsService;
diff --git a/src/components/experiment-workbench/leave-workbench-dialog.css b/src/components/experiment-workbench/leave-workbench-dialog.css
index 17673cef3053f4308b70ab85226ef78e1932c781..d77aa4714a39eb85aa63a7012dca1104df439457 100644
--- a/src/components/experiment-workbench/leave-workbench-dialog.css
+++ b/src/components/experiment-workbench/leave-workbench-dialog.css
@@ -1,4 +1,4 @@
-.leave-simulation-dialog-header {
+.leave-workbench-dialog-header {
   color: black;
   background-color: white;
 }
\ No newline at end of file
diff --git a/src/components/simulation-view/simulation-tools-service.js b/src/components/simulation-view/simulation-tools-service.js
index 1f0f9b5d99411b25520ab1af94e7d0296513f367..1d16e533f7f3722ea40880c881adce782605bee0 100644
--- a/src/components/simulation-view/simulation-tools-service.js
+++ b/src/components/simulation-view/simulation-tools-service.js
@@ -7,22 +7,22 @@ const SINGLETON_ENFORCER = Symbol();
 /**
  * Service handling server resources for simulating experiments.
  */
-class ExperimentToolsService {
+class SimulationToolsService {
   constructor(enforcer) {
     if (enforcer !== SINGLETON_ENFORCER) {
       throw new Error('Use ' + this.constructor.name + '.instance');
     }
 
     this.tools = new Map();
-    for (const toolEntry in ExperimentToolsService.TOOLS) {
-      this.registerToolConfig(ExperimentToolsService.TOOLS[toolEntry]);
+    for (const toolEntry in SimulationToolsService.TOOLS) {
+      this.registerToolConfig(SimulationToolsService.TOOLS[toolEntry]);
     }
     this.registerToolConfig(NrpCoreDashboard.CONSTANTS.TOOL_CONFIG);
   }
 
   static get instance() {
     if (_instance == null) {
-      _instance = new ExperimentToolsService(SINGLETON_ENFORCER);
+      _instance = new SimulationToolsService(SINGLETON_ENFORCER);
     }
 
     return _instance;
@@ -62,7 +62,7 @@ class ExperimentToolsService {
   }
 }
 
-ExperimentToolsService.TOOLS = Object.freeze({
+SimulationToolsService.TOOLS = Object.freeze({
   NEST_DESKTOP: {
     singleton: true,
     flexlayoutNode: {
@@ -99,11 +99,11 @@ ExperimentToolsService.TOOLS = Object.freeze({
   }
 });
 
-ExperimentToolsService.CONSTANTS = Object.freeze({
+SimulationToolsService.CONSTANTS = Object.freeze({
   CATEGORY: {
     EXTERNAL_IFRAME: 'EXTERNAL_IFRAME',
     REACT_COMPONENT: 'REACT_COMPONENT'
   }
 });
 
-export default ExperimentToolsService;
+export default SimulationToolsService;