diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
index 3a00668155522f8064f036ca2f4838e480720e7c..fb0abcaebbd995c5b3e6c86c6aab966e9481cbdd 100644
--- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
@@ -86,7 +86,7 @@ export class ActivitybarPart extends Part {
 		// Deactivate viewlet action on close
 		this.toUnbind.push(this.viewletService.onDidViewletClose(viewlet => this.compositeBar.deactivateComposite(viewlet.getId())));
 		this.toUnbind.push(this.compositeBar.onDidContextMenu(e => this.showContextMenu(e)));
-		this.toUnbind.push(this.viewletService.onDidViewletEnable(({ id, enabled }) => {
+		this.toUnbind.push(this.viewletService.onDidViewletEnablementChange(({ id, enabled }) => {
 			if (enabled) {
 				this.compositeBar.addComposite(this.viewletService.getViewlet(id));
 			} else {
diff --git a/src/vs/workbench/browser/parts/panel/panelPart.ts b/src/vs/workbench/browser/parts/panel/panelPart.ts
index bd7143f497b42596e8180a4aa98027d168efd201..bb74e114f9c2616e8a5bd297a57239561a5867f9 100644
--- a/src/vs/workbench/browser/parts/panel/panelPart.ts
+++ b/src/vs/workbench/browser/parts/panel/panelPart.ts
@@ -175,7 +175,7 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 			.sort((v1, v2) => v1.order - v2.order);
 	}
 
-	public enablePanel(id: string, enabled: boolean): void {
+	public setPanelEnablement(id: string, enabled: boolean): void {
 		const descriptor = Registry.as<PanelRegistry>(PanelExtensions.Panels).getPanels().filter(p => p.id === id).pop();
 		if (descriptor && descriptor.enabled !== enabled) {
 			descriptor.enabled = enabled;
diff --git a/src/vs/workbench/parts/search/browser/replaceService.ts b/src/vs/workbench/parts/search/browser/replaceService.ts
index c120cb59ab69e04e79d554c26a69750e9852c6de..2ba4b4d6cb224bf29f54bb091851f561be54c63c 100644
--- a/src/vs/workbench/parts/search/browser/replaceService.ts
+++ b/src/vs/workbench/parts/search/browser/replaceService.ts
@@ -109,12 +109,12 @@ export class ReplaceService implements IReplaceService {
 		const updateSearchViewLocation = () => {
 			const config = configurationService.getValue<ISearchConfiguration>();
 			if (config.search.location === 'panel') {
-				viewletService.enableViewlet(VIEW_ID, false);
-				panelService.enablePanel(VIEW_ID, true);
+				viewletService.setViewletEnablement(VIEW_ID, false);
+				panelService.setPanelEnablement(VIEW_ID, true);
 			}
 			if (config.search.location === 'sidebar') {
-				panelService.enablePanel(VIEW_ID, false);
-				viewletService.enableViewlet(VIEW_ID, true);
+				panelService.setPanelEnablement(VIEW_ID, false);
+				viewletService.setViewletEnablement(VIEW_ID, true);
 			}
 		};
 		configurationService.onDidChangeConfiguration(e => {
diff --git a/src/vs/workbench/services/panel/common/panelService.ts b/src/vs/workbench/services/panel/common/panelService.ts
index ab9a41d2f107b6c0619a9826f399d2fb8f45c5fe..5df76a3f635dfcf00bfb87f9d895db0b37cc345d 100644
--- a/src/vs/workbench/services/panel/common/panelService.ts
+++ b/src/vs/workbench/services/panel/common/panelService.ts
@@ -42,5 +42,5 @@ export interface IPanelService {
 	 * Enables or disables a panel. Disabled panels are completly hidden from UI.
 	 * By default all panels are enabled.
 	 */
-	enablePanel(id: string, enabled: boolean): void;
+	setPanelEnablement(id: string, enabled: boolean): void;
 }
diff --git a/src/vs/workbench/services/progress/test/progressService.test.ts b/src/vs/workbench/services/progress/test/progressService.test.ts
index 11dc5122571bb8c40bcd8a29a2aefb029e2fbe2a..b47aad236ffa9ee980ea03c40e4e5c5af09f2307 100644
--- a/src/vs/workbench/services/progress/test/progressService.test.ts
+++ b/src/vs/workbench/services/progress/test/progressService.test.ts
@@ -28,7 +28,7 @@ class TestViewletService implements IViewletService {
 
 	onDidViewletOpen = this.onDidViewletOpenEmitter.event;
 	onDidViewletClose = this.onDidViewletCloseEmitter.event;
-	onDidViewletEnable = this.onDidViewletEnableEmitter.event;
+	onDidViewletEnablementChange = this.onDidViewletEnableEmitter.event;
 
 	public openViewlet(id: string, focus?: boolean): TPromise<IViewlet> {
 		return TPromise.as(null);
@@ -41,7 +41,7 @@ class TestViewletService implements IViewletService {
 	public getActiveViewlet(): IViewlet {
 		return activeViewlet;
 	}
-	public enableViewlet(id: string, enabled: boolean): void { }
+	public setViewletEnablement(id: string, enabled: boolean): void { }
 
 	public dispose() {
 	}
@@ -77,7 +77,7 @@ class TestPanelService implements IPanelService {
 		return activeViewlet;
 	}
 
-	public enablePanel(id: string, enabled: boolean): void { }
+	public setPanelEnablement(id: string, enabled: boolean): void { }
 
 	public dispose() {
 	}
diff --git a/src/vs/workbench/services/viewlet/browser/viewlet.ts b/src/vs/workbench/services/viewlet/browser/viewlet.ts
index 75e3e4708e663c60c8b564743e488fb884e2ee2d..d416809eb3997e3edccf00edf2ea31e8cb84fdb8 100644
--- a/src/vs/workbench/services/viewlet/browser/viewlet.ts
+++ b/src/vs/workbench/services/viewlet/browser/viewlet.ts
@@ -18,7 +18,7 @@ export interface IViewletService {
 
 	onDidViewletOpen: Event<IViewlet>;
 	onDidViewletClose: Event<IViewlet>;
-	onDidViewletEnable: Event<{ id: string, enabled: boolean }>;
+	onDidViewletEnablementChange: Event<{ id: string, enabled: boolean }>;
 
 	/**
 	 * Opens a viewlet with the given identifier and pass keyboard focus to it if specified.
@@ -49,7 +49,7 @@ export interface IViewletService {
 	 * Enables or disables a viewlet. Disabled viewlets are completly hidden from UI.
 	 * By default all viewlets are enabled.
 	 */
-	enableViewlet(id: string, enabled: boolean): void;
+	setViewletEnablement(id: string, enabled: boolean): void;
 
 	/**
 	 *
diff --git a/src/vs/workbench/services/viewlet/browser/viewletService.ts b/src/vs/workbench/services/viewlet/browser/viewletService.ts
index 6f5d71b1412787f49b9c5ebde1d3263be84dfda4..3708327ee53fddffa79f196eb687daf0381a0172 100644
--- a/src/vs/workbench/services/viewlet/browser/viewletService.ts
+++ b/src/vs/workbench/services/viewlet/browser/viewletService.ts
@@ -35,7 +35,7 @@ export class ViewletService implements IViewletService {
 
 	public get onDidViewletOpen(): Event<IViewlet> { return this.sidebarPart.onDidViewletOpen; }
 	public get onDidViewletClose(): Event<IViewlet> { return this.sidebarPart.onDidViewletClose; }
-	public get onDidViewletEnable(): Event<{ id: string, enabled: boolean }> { return this._onDidViewletEnable.event; }
+	public get onDidViewletEnablementChange(): Event<{ id: string, enabled: boolean }> { return this._onDidViewletEnable.event; }
 
 	constructor(
 		sidebarPart: SidebarPart,
@@ -84,7 +84,7 @@ export class ViewletService implements IViewletService {
 		});
 	}
 
-	public enableViewlet(id: string, enabled: boolean): void {
+	public setViewletEnablement(id: string, enabled: boolean): void {
 		const descriptor = this.getBuiltInViewlets().filter(desc => desc.id === id).pop();
 		if (descriptor && descriptor.enabled !== enabled) {
 			descriptor.enabled = enabled;