diff --git a/src/vs/workbench/parts/debug/common/debug.ts b/src/vs/workbench/parts/debug/common/debug.ts
index 1909b03c8e9bc2570e5c5115416826eefd794eac..5b177840f302cb414b41606b774f30543860067a 100644
--- a/src/vs/workbench/parts/debug/common/debug.ts
+++ b/src/vs/workbench/parts/debug/common/debug.ts
@@ -542,7 +542,7 @@ export interface ILaunch {
 	 * Returns the resolved configuration.
 	 * Replaces os specific values, system variables, interactive variables.
 	 */
-	resolveConfiguration(config: IConfig): TPromise<IConfig>;
+	substituteVariables(config: IConfig): TPromise<IConfig>;
 
 	/**
 	 * Opens the launch.json file. Creates if it does not exist.
diff --git a/src/vs/workbench/parts/debug/common/debugModel.ts b/src/vs/workbench/parts/debug/common/debugModel.ts
index 8824e849194c523e1295e5ed7350845d89de4f09..3007f9cafbfadfee55007f7e29b83d486bc9a48f 100644
--- a/src/vs/workbench/parts/debug/common/debugModel.ts
+++ b/src/vs/workbench/parts/debug/common/debugModel.ts
@@ -875,10 +875,10 @@ export class Model implements IModel {
 		return this.breakpoints.filter(bp => bp.uri.toString() === uriString);
 	}
 
-	public getActivatedBreakpointsForResource(resource: uri): IBreakpoint[] {
+	public getEnabledBreakpointsForResource(resource: uri): IBreakpoint[] {
 		if (this.breakpointsActivated) {
 			const uriString = resource.toString();
-			return this.breakpoints.filter(bp => bp.uri.toString() === uriString);
+			return this.breakpoints.filter(bp => bp.uri.toString() === uriString && bp.enabled);
 		}
 		return [];
 	}
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
index 8f07813290a09e9545b433f465ab97ca40553f55..e7b737dfddc994d704ed81a887b9f280bc6b5496 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
@@ -619,7 +619,7 @@ class Launch implements ILaunch {
 		return undefined;
 	}
 
-	public resolveConfiguration(config: IConfig): TPromise<IConfig> {
+	public substituteVariables(config: IConfig): TPromise<IConfig> {
 		const result = objects.deepClone(config) as IConfig;
 		// Set operating system specific properties #1873
 		const setOSProperties = (flag: boolean, osConfig: IEnvConfig) => {
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
index 8b5c9af6ba92735c6dfe2d6273bd5f031d412945..1550004184a710d09c5ea59527652733c6c03c41 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
@@ -788,7 +788,7 @@ export class DebugService implements debug.IDebugService {
 
 	private createProcess(launch: debug.ILaunch, config: debug.IConfig, sessionId: string): TPromise<void> {
 		return this.textFileService.saveAll().then(() =>
-			(launch ? launch.resolveConfiguration(config) : TPromise.as(config)).then(resolvedConfig => {
+			(launch ? launch.substituteVariables(config) : TPromise.as(config)).then(resolvedConfig => {
 				if (!resolvedConfig) {
 					// User canceled resolving of interactive variables, silently return
 					return undefined;
@@ -1205,7 +1205,7 @@ export class DebugService implements debug.IDebugService {
 				return TPromise.as(null);
 			}
 
-			const breakpointsToSend = this.model.getActivatedBreakpointsForResource(modelUri).filter(bp => bp.enabled);
+			const breakpointsToSend = this.model.getEnabledBreakpointsForResource(modelUri);
 
 			const source = process.getSourceForUri(modelUri);
 			let rawSource: DebugProtocol.Source;