diff --git a/modules/plugable/pluginSystem.ts b/modules/plugable/pluginSystem.ts
index 6442c567..a3b3acd5 100644
--- a/modules/plugable/pluginSystem.ts
+++ b/modules/plugable/pluginSystem.ts
@@ -1,6 +1,3 @@
-import {WizardSelectionContext} from "cad/craft/wizard/wizardSelectionPlugin";
-
-
 type BagOfPlugins = Set<Plugin<any, any>>;
 
 export class PluginSystem {
diff --git a/web/app/cad/craft/wizard/wizardPlugin.ts b/web/app/cad/craft/wizard/wizardPlugin.ts
index 97328a85..c3ef610a 100644
--- a/web/app/cad/craft/wizard/wizardPlugin.ts
+++ b/web/app/cad/craft/wizard/wizardPlugin.ts
@@ -163,12 +163,12 @@ export function activate(ctx: ApplicationContext) {
   ctx.wizardService = services.wizard = wizardService;
 }
 
-export interface WizardOutputContext {
+export interface WizardPluginContext {
   wizardService: WizardService
 }
 
 declare module 'context' {
-  interface ApplicationContext extends WizardOutputContext {
+  interface ApplicationContext extends WizardPluginContext {
   }
 }
 
diff --git a/web/app/cad/craft/wizard/wizardSelectionPlugin.ts b/web/app/cad/craft/wizard/wizardSelectionPlugin.ts
index cab27d43..380b2459 100644
--- a/web/app/cad/craft/wizard/wizardSelectionPlugin.ts
+++ b/web/app/cad/craft/wizard/wizardSelectionPlugin.ts
@@ -4,18 +4,18 @@ import {FlattenPath, ParamsPath, WizardService} from "cad/craft/wizard/wizardTyp
 import {OperationParamValue} from "cad/craft/schema/schema";
 import {EntityReference} from "cad/craft/operationPlugin";
 import {ContextSpec, Plugin, Spec} from "plugable/pluginSystem";
-import {MarkerPluginOutputContext} from "cad/scene/selectionMarker/markerPlugin";
-import {WizardOutputContext} from "cad/craft/wizard/wizardPlugin";
-import {PickControlOutputContext} from "cad/scene/controls/pickControlPlugin";
+import {MarkerPluginContext} from "cad/scene/selectionMarker/markerPlugin";
+import {WizardPluginContext} from "cad/craft/wizard/wizardPlugin";
+import {PickControlPluginContext} from "cad/scene/controls/pickControlPlugin";
 
-export type WizardSelectionInputContext = MarkerPluginOutputContext & WizardOutputContext & PickControlOutputContext;
+export type WizardSelectionPluginInputContext = MarkerPluginContext & WizardPluginContext & PickControlPluginContext;
 
-export interface WizardSelectionOutputContext {
+export interface WizardSelectionPluginContext {
 }
 
-export type WizardSelectionContext = WizardSelectionInputContext & WizardSelectionOutputContext;
+export type WizardSelectionWorkingContext = WizardSelectionPluginInputContext & WizardSelectionPluginContext;
 
-export const WizardSelectionPlugin: Plugin<WizardSelectionInputContext, WizardSelectionOutputContext, WizardSelectionContext> = {
+export const WizardSelectionPlugin: Plugin<WizardSelectionPluginInputContext, WizardSelectionPluginContext, WizardSelectionWorkingContext> = {
 
   inputContextSpec: {
     markerService: 'required',
@@ -26,7 +26,7 @@ export const WizardSelectionPlugin: Plugin<WizardSelectionInputContext, WizardSe
   outputContextSpec: {
   },
 
-  activate(ctx: WizardSelectionContext) {
+  activate(ctx: WizardSelectionWorkingContext) {
     const wizardService = ctx.wizardService;
     wizardService.workingRequest$.attach((opRequest: OperationRequest) => {
       ctx.markerService.clear();
diff --git a/web/app/cad/dom/domPlugin.ts b/web/app/cad/dom/domPlugin.ts
index 74104643..4a90f1ab 100644
--- a/web/app/cad/dom/domPlugin.ts
+++ b/web/app/cad/dom/domPlugin.ts
@@ -10,23 +10,22 @@ export interface DomService {
 
 }
 
-export interface DomInputContext {
+interface DomPluginInputContext {
   appTabsService: AppTabsService;
   services: any;
 }
 
-export interface DomOutputContext {
+export interface DomPluginContext {
   domService: DomService;
 }
 
-export type DomContext = DomInputContext&DomOutputContext;
+type DomPluginWorkingContext = DomPluginInputContext&DomPluginContext;
 
 declare module 'context' {
-  interface ApplicationContext extends DomOutputContext {}
+  interface ApplicationContext extends DomPluginContext {}
 }
 
-
-export const DomPlugin: Plugin<DomInputContext, DomOutputContext, DomContext> = {
+export const DomPlugin: Plugin<DomPluginInputContext, DomPluginContext, DomPluginWorkingContext> = {
 
   inputContextSpec: {
     appTabsService: 'required',
@@ -37,7 +36,7 @@ export const DomPlugin: Plugin<DomInputContext, DomOutputContext, DomContext> =
     domService: 'required',
   },
 
-  activate(ctx: DomInputContext&DomOutputContext) {
+  activate(ctx: DomPluginInputContext&DomPluginContext) {
     ctx.domService = {
       viewerContainer: document.getElementById('viewer-container'),
       contributeComponent
diff --git a/web/app/cad/scene/controls/pickControlPlugin.ts b/web/app/cad/scene/controls/pickControlPlugin.ts
index 55c6ebc6..3536ca85 100644
--- a/web/app/cad/scene/controls/pickControlPlugin.ts
+++ b/web/app/cad/scene/controls/pickControlPlugin.ts
@@ -17,7 +17,7 @@ export interface PickControlService {
   simulatePickFromRay()
 }
 
-export interface PickControlOutputContext {
+export interface PickControlPluginContext {
   pickControlService: PickControlService;
 }
 
diff --git a/web/app/cad/scene/selectionMarker/markerPlugin.ts b/web/app/cad/scene/selectionMarker/markerPlugin.ts
index b3f596ec..30cd2058 100644
--- a/web/app/cad/scene/selectionMarker/markerPlugin.ts
+++ b/web/app/cad/scene/selectionMarker/markerPlugin.ts
@@ -22,7 +22,7 @@ export interface MarkerService {
   $markedEntities: Stream<MObject>
 }
 
-export interface MarkerPluginOutputContext {
+export interface MarkerPluginContext {
   markerService: MarkerService;
 }