diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
index 2aa5e667ddc425cdec4ed01477e02157ebd3568e..15f67d80bd295e711390bbefd824d4106115be83 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
@@ -36,7 +36,7 @@ import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { TogglePanelAction } from 'vs/workbench/browser/parts/panel/panelActions';
 import { TerminalPanel } from 'vs/workbench/parts/terminal/electron-browser/terminalPanel';
 import { TerminalPickerHandler } from 'vs/workbench/parts/terminal/browser/terminalQuickOpen';
-import { setupTerminalCommands } from 'vs/workbench/parts/terminal/common/terminalCommands';
+import { setupTerminalCommands, COMMAND_ID } from 'vs/workbench/parts/terminal/common/terminalCommands';
 import { setupTerminalMenu } from 'vs/workbench/parts/terminal/common/terminalMenu';
 
 const quickOpenRegistry = (Registry.as<IQuickOpenRegistry>(QuickOpenExtensions.Quickopen));
@@ -231,13 +231,13 @@ configurationRegistry.registerConfiguration({
 				QUICKOPEN_ACTION_ID,
 				QUICKOPEN_FOCUS_SECONDARY_ACTION_ID,
 				ShowAllCommandsAction.ID,
-				CreateNewTerminalAction.ID,
-				CreateNewInActiveWorkspaceTerminalAction.ID,
-				CopyTerminalSelectionAction.ID,
-				KillTerminalAction.ID,
-				FocusActiveTerminalAction.ID,
-				FocusPreviousTerminalAction.ID,
-				FocusNextTerminalAction.ID,
+				COMMAND_ID.NEW,
+				COMMAND_ID.NEW_IN_ACTIVE_WORKSPACE,
+				COMMAND_ID.COPY_SELECTION,
+				COMMAND_ID.KILL,
+				COMMAND_ID.FOCUS,
+				COMMAND_ID.FOCUS_PREVIOUS,
+				COMMAND_ID.FOCUS_NEXT,
 				'workbench.action.tasks.build',
 				'workbench.action.tasks.restartTask',
 				'workbench.action.tasks.runTask',
@@ -261,18 +261,18 @@ configurationRegistry.registerConfiguration({
 				'workbench.action.focusSixthEditorGroup',
 				'workbench.action.focusSeventhEditorGroup',
 				'workbench.action.focusEighthEditorGroup',
-				TerminalPasteAction.ID,
-				RunSelectedTextInTerminalAction.ID,
-				RunActiveFileInTerminalAction.ID,
-				ToggleTerminalAction.ID,
-				ScrollDownTerminalAction.ID,
-				ScrollDownPageTerminalAction.ID,
-				ScrollToBottomTerminalAction.ID,
-				ScrollUpTerminalAction.ID,
-				ScrollUpPageTerminalAction.ID,
-				ScrollToTopTerminalAction.ID,
-				ClearTerminalAction.ID,
-				ClearSelectionTerminalAction.ID,
+				COMMAND_ID.PASTE,
+				COMMAND_ID.RUN_SELECTED_TEXT,
+				COMMAND_ID.RUN_ACTIVE_FILE,
+				COMMAND_ID.TOGGLE,
+				COMMAND_ID.SCROLL_DOWN_LINE,
+				COMMAND_ID.SCROLL_DOWN_PAGE,
+				COMMAND_ID.SCROLL_TO_BOTTOM,
+				COMMAND_ID.SCROLL_UP_LINE,
+				COMMAND_ID.SCROLL_UP_PAGE,
+				COMMAND_ID.SCROLL_TO_TOP,
+				COMMAND_ID.CLEAR,
+				COMMAND_ID.CLEAR_SELECTION,
 				debugActions.StartAction.ID,
 				debugActions.StopAction.ID,
 				debugActions.RunAction.ID,
@@ -289,33 +289,33 @@ configurationRegistry.registerConfiguration({
 				FocusLastGroupAction.ID,
 				OpenFirstEditorInGroup.ID,
 				OpenLastEditorInGroup.ID,
-				SelectAllTerminalAction.ID,
-				FocusTerminalFindWidgetAction.ID,
-				HideTerminalFindWidgetAction.ID,
+				COMMAND_ID.SELECT_ALL,
+				COMMAND_ID.FIND_WIDGET_FOCUS,
+				COMMAND_ID.FIND_WIDGET_HIDE,
 				NavigateUpAction.ID,
 				NavigateDownAction.ID,
 				NavigateRightAction.ID,
 				NavigateLeftAction.ID,
-				DeleteWordLeftTerminalAction.ID,
-				DeleteWordRightTerminalAction.ID,
-				MoveToLineStartTerminalAction.ID,
-				MoveToLineEndTerminalAction.ID,
+				COMMAND_ID.DELETE_WORD_LEFT,
+				COMMAND_ID.DELETE_WORD_RIGHT,
+				COMMAND_ID.MOVE_TO_LINE_START,
+				COMMAND_ID.MOVE_TO_LINE_END,
 				TogglePanelAction.ID,
 				'workbench.action.quickOpenView',
-				SplitTerminalAction.ID,
-				SplitInActiveWorkspaceTerminalAction.ID,
-				FocusPreviousPaneTerminalAction.ID,
-				FocusNextPaneTerminalAction.ID,
-				ResizePaneLeftTerminalAction.ID,
-				ResizePaneRightTerminalAction.ID,
-				ResizePaneUpTerminalAction.ID,
-				ResizePaneDownTerminalAction.ID,
-				ScrollToPreviousCommandAction.ID,
-				ScrollToNextCommandAction.ID,
-				SelectToPreviousCommandAction.ID,
-				SelectToNextCommandAction.ID,
-				SelectToPreviousLineAction.ID,
-				SelectToNextLineAction.ID
+				COMMAND_ID.SPLIT,
+				COMMAND_ID.SPLIT_IN_ACTIVE_WORKSPACE,
+				COMMAND_ID.FOCUS_PREVIOUS_PANE,
+				COMMAND_ID.FOCUS_NEXT_PANE,
+				COMMAND_ID.RESIZE_PANE_LEFT,
+				COMMAND_ID.RESIZE_PANE_RIGHT,
+				COMMAND_ID.RESIZE_PANE_UP,
+				COMMAND_ID.RESIZE_PANE_DOWN,
+				COMMAND_ID.SCROLL_TO_PREVIOUS_COMMAND,
+				COMMAND_ID.SCROLL_TO_NEXT_COMMAND,
+				COMMAND_ID.SELECT_TO_PREVIOUS_COMMAND,
+				COMMAND_ID.SELECT_TO_NEXT_COMMAND,
+				COMMAND_ID.SELECT_TO_PREVIOUS_LINE,
+				COMMAND_ID.SELECT_TO_NEXT_LINE
 			].sort()
 		},
 		'terminal.integrated.env.osx': {
diff --git a/src/vs/workbench/parts/watermark/electron-browser/watermark.ts b/src/vs/workbench/parts/watermark/electron-browser/watermark.ts
index 44449b32df26299bce07fc0d9405d91a9e8f353f..a1d1f280b4aba44b23d803468b162e79bfaf6aed 100644
--- a/src/vs/workbench/parts/watermark/electron-browser/watermark.ts
+++ b/src/vs/workbench/parts/watermark/electron-browser/watermark.ts
@@ -24,9 +24,9 @@ import { ShowAllCommandsAction } from 'vs/workbench/parts/quickopen/browser/comm
 import { Parts, IPartService, IDimension } from 'vs/workbench/services/part/common/partService';
 import { StartAction } from 'vs/workbench/parts/debug/browser/debugActions';
 import { FindInFilesActionId } from 'vs/workbench/parts/search/common/constants';
-import { ToggleTerminalAction } from 'vs/workbench/parts/terminal/electron-browser/terminalActions';
 import { escape } from 'vs/base/common/strings';
 import { QUICKOPEN_ACTION_ID } from 'vs/workbench/browser/parts/quickopen/quickopen';
+import { COMMAND_ID as TERMINAL_COMMAND_ID } from 'vs/workbench/parts/terminal/common/terminalCommands';
 
 interface WatermarkEntry {
 	text: string;
@@ -68,7 +68,7 @@ const newUntitledFile: WatermarkEntry = {
 const newUntitledFileMacOnly: WatermarkEntry = assign({ mac: true }, newUntitledFile);
 const toggleTerminal: WatermarkEntry = {
 	text: nls.localize({ key: 'watermark.toggleTerminal', comment: ['toggle is a verb here'] }, "Toggle Terminal"),
-	ids: [ToggleTerminalAction.ID]
+	ids: [TERMINAL_COMMAND_ID.TOGGLE]
 };
 
 const findInFiles: WatermarkEntry = {