diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts
index 71ad6ba5f97..7b78569f9b6 100644
--- a/src/vs/editor/common/modes.ts
+++ b/src/vs/editor/common/modes.ts
@@ -258,32 +258,108 @@ export interface HoverProvider {
 /**
  * @internal
  */
-export type SuggestionType = 'method'
-	| 'function'
-	| 'constructor'
-	| 'field'
-	| 'variable'
-	| 'class'
-	| 'struct'
-	| 'interface'
-	| 'module'
-	| 'property'
-	| 'event'
-	| 'operator'
-	| 'unit'
-	| 'value'
-	| 'constant'
-	| 'enum'
-	| 'enum-member'
-	| 'keyword'
-	| 'snippet'
-	| 'text'
-	| 'color'
-	| 'file'
-	| 'reference'
-	| 'customcolor'
-	| 'folder'
-	| 'type-parameter';
+export const enum SuggestionKind {
+	Method,
+	Function,
+	Constructor,
+	Field,
+	Variable,
+	Class,
+	Struct,
+	Interface,
+	Module,
+	Property,
+	Event,
+	Operator,
+	Unit,
+	Value,
+	Constant,
+	Enum,
+	EnumMember,
+	Keyword,
+	Snippet,
+	Text,
+	Color,
+	File,
+	Reference,
+	Customcolor,
+	Folder,
+	TypeParameter,
+}
+
+/**
+ * @internal
+ */
+export let suggestionKindToCssClass = (function () {
+	let data = Object.create(null);
+	data[SuggestionKind.Method] = 'method';
+	data[SuggestionKind.Function] = 'function';
+	data[SuggestionKind.Constructor] = 'constructor';
+	data[SuggestionKind.Field] = 'field';
+	data[SuggestionKind.Variable] = 'variable';
+	data[SuggestionKind.Class] = 'class';
+	data[SuggestionKind.Struct] = 'struct';
+	data[SuggestionKind.Interface] = 'interface';
+	data[SuggestionKind.Module] = 'module';
+	data[SuggestionKind.Property] = 'property';
+	data[SuggestionKind.Event] = 'event';
+	data[SuggestionKind.Operator] = 'operator';
+	data[SuggestionKind.Unit] = 'unit';
+	data[SuggestionKind.Value] = 'value';
+	data[SuggestionKind.Constant] = 'constant';
+	data[SuggestionKind.Enum] = 'enum';
+	data[SuggestionKind.EnumMember] = 'enum-member';
+	data[SuggestionKind.Keyword] = 'keyword';
+	data[SuggestionKind.Snippet] = 'snippet';
+	data[SuggestionKind.Text] = 'text';
+	data[SuggestionKind.Color] = 'color';
+	data[SuggestionKind.File] = 'file';
+	data[SuggestionKind.Reference] = 'reference';
+	data[SuggestionKind.Customcolor] = 'customcolor';
+	data[SuggestionKind.Folder] = 'folder';
+	data[SuggestionKind.TypeParameter] = 'type-parameter';
+
+	return function (kind: SuggestionKind) {
+		return data[kind] || 'property';
+	};
+})();
+
+/**
+ * @internal
+ */
+export let suggestionKindFromLegacyString = (function () {
+	let data = Object.create(null);
+	data['method'] = SuggestionKind.Method;
+	data['function'] = SuggestionKind.Function;
+	data['constructor'] = SuggestionKind.Constructor;
+	data['field'] = SuggestionKind.Field;
+	data['variable'] = SuggestionKind.Variable;
+	data['class'] = SuggestionKind.Class;
+	data['struct'] = SuggestionKind.Struct;
+	data['interface'] = SuggestionKind.Interface;
+	data['module'] = SuggestionKind.Module;
+	data['property'] = SuggestionKind.Property;
+	data['event'] = SuggestionKind.Event;
+	data['operator'] = SuggestionKind.Operator;
+	data['unit'] = SuggestionKind.Unit;
+	data['value'] = SuggestionKind.Value;
+	data['constant'] = SuggestionKind.Constant;
+	data['enum'] = SuggestionKind.Enum;
+	data['enum-member'] = SuggestionKind.EnumMember;
+	data['keyword'] = SuggestionKind.Keyword;
+	data['snippet'] = SuggestionKind.Snippet;
+	data['text'] = SuggestionKind.Text;
+	data['color'] = SuggestionKind.Color;
+	data['file'] = SuggestionKind.File;
+	data['reference'] = SuggestionKind.Reference;
+	data['customcolor'] = SuggestionKind.Customcolor;
+	data['folder'] = SuggestionKind.Folder;
+	data['type-parameter'] = SuggestionKind.TypeParameter;
+
+	return function (value: string) {
+		return data[value] || 'property';
+	};
+})();
 
 /**
  * @internal
@@ -292,7 +368,7 @@ export interface ISuggestion {
 	label: string;
 	insertText: string;
 	insertTextIsSnippet?: boolean;
-	type: SuggestionType;
+	kind: SuggestionKind;
 	detail?: string;
 	documentation?: string | IMarkdownString;
 	filterText?: string;
diff --git a/src/vs/editor/common/services/editorSimpleWorker.ts b/src/vs/editor/common/services/editorSimpleWorker.ts
index 63b1b81f1ea..667861ff701 100644
--- a/src/vs/editor/common/services/editorSimpleWorker.ts
+++ b/src/vs/editor/common/services/editorSimpleWorker.ts
@@ -15,7 +15,7 @@ import { stringDiff } from 'vs/base/common/diff/diff';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { Position, IPosition } from 'vs/editor/common/core/position';
 import { MirrorTextModel as BaseMirrorModel, IModelChangedEvent } from 'vs/editor/common/model/mirrorTextModel';
-import { IInplaceReplaceSupportResult, ILink, ISuggestResult, ISuggestion, TextEdit } from 'vs/editor/common/modes';
+import { IInplaceReplaceSupportResult, ILink, ISuggestResult, ISuggestion, TextEdit, SuggestionKind } from 'vs/editor/common/modes';
 import { computeLinks, ILinkComputerTarget } from 'vs/editor/common/modes/linkComputer';
 import { BasicInplaceReplace } from 'vs/editor/common/modes/supports/inplaceReplaceSupport';
 import { getWordAtText, ensureValidWordDefinition } from 'vs/editor/common/model/wordHelper';
@@ -482,7 +482,7 @@ export abstract class BaseEditorSimpleWorker {
 				}
 
 				suggestions.push({
-					type: 'text',
+					kind: SuggestionKind.Text,
 					label: word,
 					insertText: word,
 					noAutoAccept: true,
diff --git a/src/vs/editor/contrib/snippet/snippetController2.ts b/src/vs/editor/contrib/snippet/snippetController2.ts
index 03e9a581b1a..67a0000f73a 100644
--- a/src/vs/editor/contrib/snippet/snippetController2.ts
+++ b/src/vs/editor/contrib/snippet/snippetController2.ts
@@ -14,7 +14,7 @@ import { Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ISuggestion } from 'vs/editor/common/modes';
+import { ISuggestion, SuggestionKind } from 'vs/editor/common/modes';
 import { Choice } from 'vs/editor/contrib/snippet/snippetParser';
 import { showSimpleSuggestions } from 'vs/editor/contrib/suggest/suggest';
 import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
@@ -169,7 +169,7 @@ export class SnippetController2 implements IEditorContribution {
 				// let after = choice.options.slice(i);
 
 				return <ISuggestion>{
-					type: 'value',
+					kind: SuggestionKind.Value,
 					label: option.value,
 					insertText: option.value,
 					// insertText: `\${1|${after.concat(before).join(',')}|}$0`,
diff --git a/src/vs/editor/contrib/suggest/completionModel.ts b/src/vs/editor/contrib/suggest/completionModel.ts
index 3ca9d14e882..46cb6c90d84 100644
--- a/src/vs/editor/contrib/suggest/completionModel.ts
+++ b/src/vs/editor/contrib/suggest/completionModel.ts
@@ -7,7 +7,7 @@
 
 import { fuzzyScore, fuzzyScoreGracefulAggressive, anyScore } from 'vs/base/common/filters';
 import { isDisposable } from 'vs/base/common/lifecycle';
-import { ISuggestResult, ISuggestSupport } from 'vs/editor/common/modes';
+import { ISuggestResult, ISuggestSupport, SuggestionKind } from 'vs/editor/common/modes';
 import { ISuggestionItem } from './suggest';
 import { InternalSuggestOptions, EDITOR_DEFAULTS } from 'vs/editor/common/config/editorOptions';
 import { WordDistance } from 'vs/editor/contrib/suggest/wordDistance';
@@ -222,9 +222,9 @@ export class CompletionModel {
 
 			// update stats
 			this._stats.suggestionCount++;
-			switch (suggestion.type) {
-				case 'snippet': this._stats.snippetCount++; break;
-				case 'text': this._stats.textCount++; break;
+			switch (suggestion.kind) {
+				case SuggestionKind.Snippet: this._stats.snippetCount++; break;
+				case SuggestionKind.Text: this._stats.textCount++; break;
 			}
 		}
 
@@ -251,10 +251,10 @@ export class CompletionModel {
 	}
 
 	private static _compareCompletionItemsSnippetsDown(a: ICompletionItem, b: ICompletionItem): number {
-		if (a.suggestion.type !== b.suggestion.type) {
-			if (a.suggestion.type === 'snippet') {
+		if (a.suggestion.kind !== b.suggestion.kind) {
+			if (a.suggestion.kind === SuggestionKind.Snippet) {
 				return 1;
-			} else if (b.suggestion.type === 'snippet') {
+			} else if (b.suggestion.kind === SuggestionKind.Snippet) {
 				return -1;
 			}
 		}
@@ -262,10 +262,10 @@ export class CompletionModel {
 	}
 
 	private static _compareCompletionItemsSnippetsUp(a: ICompletionItem, b: ICompletionItem): number {
-		if (a.suggestion.type !== b.suggestion.type) {
-			if (a.suggestion.type === 'snippet') {
+		if (a.suggestion.kind !== b.suggestion.kind) {
+			if (a.suggestion.kind === SuggestionKind.Snippet) {
 				return -1;
-			} else if (b.suggestion.type === 'snippet') {
+			} else if (b.suggestion.kind === SuggestionKind.Snippet) {
 				return 1;
 			}
 		}
diff --git a/src/vs/editor/contrib/suggest/suggest.ts b/src/vs/editor/contrib/suggest/suggest.ts
index 595bbfc961f..8ffed9216b9 100644
--- a/src/vs/editor/contrib/suggest/suggest.ts
+++ b/src/vs/editor/contrib/suggest/suggest.ts
@@ -11,7 +11,7 @@ import { onUnexpectedExternalError, canceled } from 'vs/base/common/errors';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { ITextModel } from 'vs/editor/common/model';
 import { registerDefaultLanguageCommand } from 'vs/editor/browser/editorExtensions';
-import { ISuggestResult, ISuggestSupport, ISuggestion, SuggestRegistry, SuggestContext, SuggestTriggerKind } from 'vs/editor/common/modes';
+import { ISuggestResult, ISuggestSupport, ISuggestion, SuggestRegistry, SuggestContext, SuggestTriggerKind, SuggestionKind } from 'vs/editor/common/modes';
 import { Position, IPosition } from 'vs/editor/common/core/position';
 import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
@@ -152,7 +152,7 @@ function createSuggestionResolver(provider: ISuggestSupport, suggestion: ISugges
 
 function createSuggesionFilter(snippetConfig: SnippetConfig): (candidate: ISuggestion) => boolean {
 	if (snippetConfig === 'none') {
-		return suggestion => suggestion.type !== 'snippet';
+		return suggestion => suggestion.kind !== SuggestionKind.Snippet;
 	} else {
 		return () => true;
 	}
@@ -172,10 +172,10 @@ function defaultComparator(a: ISuggestionItem, b: ISuggestionItem): number {
 	}
 
 	// check with 'type' and lower snippets
-	if (ret === 0 && a.suggestion.type !== b.suggestion.type) {
-		if (a.suggestion.type === 'snippet') {
+	if (ret === 0 && a.suggestion.kind !== b.suggestion.kind) {
+		if (a.suggestion.kind === SuggestionKind.Snippet) {
 			ret = 1;
-		} else if (b.suggestion.type === 'snippet') {
+		} else if (b.suggestion.kind === SuggestionKind.Snippet) {
 			ret = -1;
 		}
 	}
@@ -184,10 +184,10 @@ function defaultComparator(a: ISuggestionItem, b: ISuggestionItem): number {
 }
 
 function snippetUpComparator(a: ISuggestionItem, b: ISuggestionItem): number {
-	if (a.suggestion.type !== b.suggestion.type) {
-		if (a.suggestion.type === 'snippet') {
+	if (a.suggestion.kind !== b.suggestion.kind) {
+		if (a.suggestion.kind === SuggestionKind.Snippet) {
 			return -1;
-		} else if (b.suggestion.type === 'snippet') {
+		} else if (b.suggestion.kind === SuggestionKind.Snippet) {
 			return 1;
 		}
 	}
@@ -195,10 +195,10 @@ function snippetUpComparator(a: ISuggestionItem, b: ISuggestionItem): number {
 }
 
 function snippetDownComparator(a: ISuggestionItem, b: ISuggestionItem): number {
-	if (a.suggestion.type !== b.suggestion.type) {
-		if (a.suggestion.type === 'snippet') {
+	if (a.suggestion.kind !== b.suggestion.kind) {
+		if (a.suggestion.kind === SuggestionKind.Snippet) {
 			return 1;
-		} else if (b.suggestion.type === 'snippet') {
+		} else if (b.suggestion.kind === SuggestionKind.Snippet) {
 			return -1;
 		}
 	}
diff --git a/src/vs/editor/contrib/suggest/suggestController.ts b/src/vs/editor/contrib/suggest/suggestController.ts
index 04504e8fc60..b8e875875f6 100644
--- a/src/vs/editor/contrib/suggest/suggestController.ts
+++ b/src/vs/editor/contrib/suggest/suggestController.ts
@@ -278,7 +278,7 @@ export class SuggestController implements IEditorContribution {
 			}
 		*/
 		service.publicLog('acceptSuggestion', {
-			type: item.type,
+			type: item.kind,
 			multiline: item.insertText.match(/\r|\n/)
 		});
 	}
diff --git a/src/vs/editor/contrib/suggest/suggestMemory.ts b/src/vs/editor/contrib/suggest/suggestMemory.ts
index e278a619c96..be06c20f287 100644
--- a/src/vs/editor/contrib/suggest/suggestMemory.ts
+++ b/src/vs/editor/contrib/suggest/suggestMemory.ts
@@ -10,6 +10,7 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag
 import { ITextModel } from 'vs/editor/common/model';
 import { IPosition } from 'vs/editor/common/core/position';
 import { RunOnceScheduler } from 'vs/base/common/async';
+import { SuggestionKind, suggestionKindFromLegacyString } from 'vs/editor/common/modes';
 
 export abstract class Memory {
 
@@ -55,7 +56,7 @@ export class NoMemory extends Memory {
 }
 
 export interface MemItem {
-	type: string;
+	type: string | SuggestionKind;
 	insertText: string;
 	touch: number;
 }
@@ -70,7 +71,7 @@ export class LRUMemory extends Memory {
 		const key = `${model.getLanguageIdentifier().language}/${label}`;
 		this._cache.set(key, {
 			touch: this._seq++,
-			type: item.suggestion.type,
+			type: item.suggestion.kind,
 			insertText: item.suggestion.insertText
 		});
 	}
@@ -94,7 +95,7 @@ export class LRUMemory extends Memory {
 			const { suggestion } = items[i];
 			const key = `${model.getLanguageIdentifier().language}/${suggestion.label}`;
 			const item = this._cache.get(key);
-			if (item && item.touch > seq && item.type === suggestion.type && item.insertText === suggestion.insertText) {
+			if (item && item.touch > seq && item.type === suggestion.kind && item.insertText === suggestion.insertText) {
 				seq = item.touch;
 				res = i;
 			}
@@ -119,6 +120,7 @@ export class LRUMemory extends Memory {
 		let seq = 0;
 		for (const [key, value] of data) {
 			value.touch = seq;
+			value.type = typeof value.type === 'number' ? value.type : suggestionKindFromLegacyString(value.type);
 			this._cache.set(key, value);
 		}
 		this._seq = this._cache.size;
@@ -135,7 +137,7 @@ export class PrefixMemory extends Memory {
 		const { word } = model.getWordUntilPosition(pos);
 		const key = `${model.getLanguageIdentifier().language}/${word}`;
 		this._trie.set(key, {
-			type: item.suggestion.type,
+			type: item.suggestion.kind,
 			insertText: item.suggestion.insertText,
 			touch: this._seq++
 		});
@@ -153,8 +155,8 @@ export class PrefixMemory extends Memory {
 		}
 		if (item) {
 			for (let i = 0; i < items.length; i++) {
-				let { type, insertText } = items[i].suggestion;
-				if (type === item.type && insertText === item.insertText) {
+				let { kind, insertText } = items[i].suggestion;
+				if (kind === item.type && insertText === item.insertText) {
 					return i;
 				}
 			}
@@ -182,6 +184,7 @@ export class PrefixMemory extends Memory {
 		if (data.length > 0) {
 			this._seq = data[0][1].touch + 1;
 			for (const [key, value] of data) {
+				value.type = typeof value.type === 'number' ? value.type : suggestionKindFromLegacyString(value.type);
 				this._trie.set(key, value);
 			}
 		}
diff --git a/src/vs/editor/contrib/suggest/suggestWidget.ts b/src/vs/editor/contrib/suggest/suggestWidget.ts
index cdbc8ef1dc4..aa695cb66b5 100644
--- a/src/vs/editor/contrib/suggest/suggestWidget.ts
+++ b/src/vs/editor/contrib/suggest/suggestWidget.ts
@@ -34,6 +34,7 @@ import { IModeService } from 'vs/editor/common/services/modeService';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { TimeoutTimer, CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
 import { CancellationToken } from 'vs/base/common/cancellation';
+import { SuggestionKind, suggestionKindToCssClass } from 'vs/editor/common/modes';
 
 const expandSuggestionDocsByDefault = false;
 const maxSuggestionsToShow = 12;
@@ -137,10 +138,10 @@ class Renderer implements IRenderer<ICompletionItem, ISuggestionTemplateData> {
 		const data = <ISuggestionTemplateData>templateData;
 		const suggestion = (<ICompletionItem>element).suggestion;
 
-		data.icon.className = 'icon ' + suggestion.type;
+		data.icon.className = 'icon ' + suggestionKindToCssClass(suggestion.kind);
 		data.colorspan.style.backgroundColor = '';
 
-		if (suggestion.type === 'color') {
+		if (suggestion.kind === SuggestionKind.Color) {
 			let color = matchesColor(suggestion.label) || typeof suggestion.documentation === 'string' && matchesColor(suggestion.documentation);
 			if (color) {
 				data.icon.className = 'icon customcolor';
@@ -501,7 +502,7 @@ export class SuggestWidget implements IContentWidget, IVirtualDelegate<ICompleti
 	}
 
 	private _getSuggestionAriaAlertLabel(item: ICompletionItem): string {
-		const isSnippet = item.suggestion.type === 'snippet';
+		const isSnippet = item.suggestion.kind === SuggestionKind.Snippet;
 
 		if (!canExpandCompletionItem(item)) {
 			return isSnippet ? nls.localize('ariaCurrentSnippetSuggestion', "{0}, snippet suggestion", item.suggestion.label)
diff --git a/src/vs/editor/contrib/suggest/test/completionModel.test.ts b/src/vs/editor/contrib/suggest/test/completionModel.test.ts
index f7ccbd51b1a..37e9aa92cc4 100644
--- a/src/vs/editor/contrib/suggest/test/completionModel.test.ts
+++ b/src/vs/editor/contrib/suggest/test/completionModel.test.ts
@@ -7,12 +7,12 @@
 import * as assert from 'assert';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IPosition } from 'vs/editor/common/core/position';
-import { ISuggestResult, ISuggestSupport, ISuggestion, SuggestionType } from 'vs/editor/common/modes';
+import { ISuggestResult, ISuggestSupport, ISuggestion, SuggestionKind } from 'vs/editor/common/modes';
 import { CompletionModel } from 'vs/editor/contrib/suggest/completionModel';
 import { ISuggestionItem, getSuggestionComparator } from 'vs/editor/contrib/suggest/suggest';
 import { WordDistance } from 'vs/editor/contrib/suggest/wordDistance';
 
-export function createSuggestItem(label: string, overwriteBefore: number, type: SuggestionType = 'property', incomplete: boolean = false, position: IPosition = { lineNumber: 1, column: 1 }): ISuggestionItem {
+export function createSuggestItem(label: string, overwriteBefore: number, kind = SuggestionKind.Property, incomplete: boolean = false, position: IPosition = { lineNumber: 1, column: 1 }): ISuggestionItem {
 
 	return new class implements ISuggestionItem {
 
@@ -22,7 +22,7 @@ export function createSuggestItem(label: string, overwriteBefore: number, type:
 			label,
 			overwriteBefore,
 			insertText: label,
-			type
+			kind
 		};
 
 		container: ISuggestResult = {
@@ -162,9 +162,9 @@ suite('CompletionModel', function () {
 	test('keep snippet sorting with prefix: top, #25495', function () {
 
 		model = new CompletionModel([
-			createSuggestItem('Snippet1', 1, 'snippet'),
-			createSuggestItem('tnippet2', 1, 'snippet'),
-			createSuggestItem('semver', 1, 'property'),
+			createSuggestItem('Snippet1', 1, SuggestionKind.Snippet),
+			createSuggestItem('tnippet2', 1, SuggestionKind.Snippet),
+			createSuggestItem('semver', 1, SuggestionKind.Property),
 		], 1, {
 				leadingLineContent: 's',
 				characterCountDelta: 0
@@ -181,9 +181,9 @@ suite('CompletionModel', function () {
 	test('keep snippet sorting with prefix: bottom, #25495', function () {
 
 		model = new CompletionModel([
-			createSuggestItem('snippet1', 1, 'snippet'),
-			createSuggestItem('tnippet2', 1, 'snippet'),
-			createSuggestItem('Semver', 1, 'property'),
+			createSuggestItem('snippet1', 1, SuggestionKind.Snippet),
+			createSuggestItem('tnippet2', 1, SuggestionKind.Snippet),
+			createSuggestItem('Semver', 1, SuggestionKind.Property),
 		], 1, {
 				leadingLineContent: 's',
 				characterCountDelta: 0
@@ -199,9 +199,9 @@ suite('CompletionModel', function () {
 	test('keep snippet sorting with prefix: inline, #25495', function () {
 
 		model = new CompletionModel([
-			createSuggestItem('snippet1', 1, 'snippet'),
-			createSuggestItem('tnippet2', 1, 'snippet'),
-			createSuggestItem('Semver', 1, 'property'),
+			createSuggestItem('snippet1', 1, SuggestionKind.Snippet),
+			createSuggestItem('tnippet2', 1, SuggestionKind.Snippet),
+			createSuggestItem('Semver', 1),
 		], 1, {
 				leadingLineContent: 's',
 				characterCountDelta: 0
@@ -216,9 +216,9 @@ suite('CompletionModel', function () {
 
 	test('filterText seems ignored in autocompletion, #26874', function () {
 
-		const item1 = createSuggestItem('Map - java.util', 1, 'property');
+		const item1 = createSuggestItem('Map - java.util', 1);
 		item1.suggestion.filterText = 'Map';
-		const item2 = createSuggestItem('Map - java.util', 1, 'property');
+		const item2 = createSuggestItem('Map - java.util', 1);
 
 		model = new CompletionModel([item1, item2], 1, {
 			leadingLineContent: 'M',
@@ -236,11 +236,11 @@ suite('CompletionModel', function () {
 
 	test('Vscode 1.12 no longer obeys \'sortText\' in completion items (from language server), #26096', function () {
 
-		const item1 = createSuggestItem('<- groups', 2, 'property', false, { lineNumber: 1, column: 3 });
+		const item1 = createSuggestItem('<- groups', 2, SuggestionKind.Property, false, { lineNumber: 1, column: 3 });
 		item1.suggestion.filterText = '  groups';
 		item1.suggestion.sortText = '00002';
 
-		const item2 = createSuggestItem('source', 0, 'property', false, { lineNumber: 1, column: 3 });
+		const item2 = createSuggestItem('source', 0, SuggestionKind.Property, false, { lineNumber: 1, column: 3 });
 		item2.suggestion.filterText = 'source';
 		item2.suggestion.sortText = '00001';
 
@@ -260,11 +260,11 @@ suite('CompletionModel', function () {
 
 	test('Score only filtered items when typing more, score all when typing less', function () {
 		model = new CompletionModel([
-			createSuggestItem('console', 0, 'property'),
-			createSuggestItem('co_new', 0, 'property'),
-			createSuggestItem('bar', 0, 'property'),
-			createSuggestItem('car', 0, 'property'),
-			createSuggestItem('foo', 0, 'property'),
+			createSuggestItem('console', 0),
+			createSuggestItem('co_new', 0),
+			createSuggestItem('bar', 0),
+			createSuggestItem('car', 0),
+			createSuggestItem('foo', 0),
 		], 1, {
 				leadingLineContent: '',
 				characterCountDelta: 0
@@ -287,11 +287,11 @@ suite('CompletionModel', function () {
 
 	test('Have more relaxed suggest matching algorithm #15419', function () {
 		model = new CompletionModel([
-			createSuggestItem('result', 0, 'property'),
-			createSuggestItem('replyToUser', 0, 'property'),
-			createSuggestItem('randomLolut', 0, 'property'),
-			createSuggestItem('car', 0, 'property'),
-			createSuggestItem('foo', 0, 'property'),
+			createSuggestItem('result', 0),
+			createSuggestItem('replyToUser', 0),
+			createSuggestItem('randomLolut', 0),
+			createSuggestItem('car', 0),
+			createSuggestItem('foo', 0),
 		], 1, {
 				leadingLineContent: '',
 				characterCountDelta: 0
@@ -309,11 +309,11 @@ suite('CompletionModel', function () {
 
 	test('Emmet suggestion not appearing at the top of the list in jsx files, #39518', function () {
 		model = new CompletionModel([
-			createSuggestItem('from', 0, 'property'),
-			createSuggestItem('form', 0, 'property'),
-			createSuggestItem('form:get', 0, 'property'),
-			createSuggestItem('testForeignMeasure', 0, 'property'),
-			createSuggestItem('fooRoom', 0, 'property'),
+			createSuggestItem('from', 0),
+			createSuggestItem('form', 0),
+			createSuggestItem('form:get', 0),
+			createSuggestItem('testForeignMeasure', 0),
+			createSuggestItem('fooRoom', 0),
 		], 1, {
 				leadingLineContent: '',
 				characterCountDelta: 0
diff --git a/src/vs/editor/contrib/suggest/test/suggest.test.ts b/src/vs/editor/contrib/suggest/test/suggest.test.ts
index f8f5d2133ff..6052516beef 100644
--- a/src/vs/editor/contrib/suggest/test/suggest.test.ts
+++ b/src/vs/editor/contrib/suggest/test/suggest.test.ts
@@ -7,7 +7,7 @@
 import * as assert from 'assert';
 import { URI } from 'vs/base/common/uri';
 import { IDisposable } from 'vs/base/common/lifecycle';
-import { SuggestRegistry } from 'vs/editor/common/modes';
+import { SuggestRegistry, SuggestionKind } from 'vs/editor/common/modes';
 import { provideSuggestionItems } from 'vs/editor/contrib/suggest/suggest';
 import { Position } from 'vs/editor/common/core/position';
 import { TextModel } from 'vs/editor/common/model/textModel';
@@ -27,15 +27,15 @@ suite('Suggest', function () {
 					incomplete: false,
 					suggestions: [{
 						label: 'aaa',
-						type: 'snippet',
+						kind: SuggestionKind.Snippet,
 						insertText: 'aaa'
 					}, {
 						label: 'zzz',
-						type: 'snippet',
+						kind: SuggestionKind.Snippet,
 						insertText: 'zzz'
 					}, {
 						label: 'fff',
-						type: 'property',
+						kind: SuggestionKind.Property,
 						insertText: 'fff'
 					}]
 				};
diff --git a/src/vs/editor/contrib/suggest/test/suggestModel.test.ts b/src/vs/editor/contrib/suggest/test/suggestModel.test.ts
index c493282bcd0..d3ede25d9ee 100644
--- a/src/vs/editor/contrib/suggest/test/suggestModel.test.ts
+++ b/src/vs/editor/contrib/suggest/test/suggestModel.test.ts
@@ -15,7 +15,7 @@ import { Selection } from 'vs/editor/common/core/selection';
 import { TokenizationResult2 } from 'vs/editor/common/core/token';
 import { Handler } from 'vs/editor/common/editorCommon';
 import { TextModel } from 'vs/editor/common/model/textModel';
-import { IState, ISuggestResult, ISuggestSupport, LanguageIdentifier, MetadataConsts, SuggestRegistry, SuggestTriggerKind, TokenizationRegistry } from 'vs/editor/common/modes';
+import { IState, ISuggestResult, ISuggestSupport, LanguageIdentifier, MetadataConsts, SuggestRegistry, SuggestTriggerKind, TokenizationRegistry, SuggestionKind } from 'vs/editor/common/modes';
 import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
 import { NULL_STATE } from 'vs/editor/common/modes/nullMode';
 import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2';
@@ -157,7 +157,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 				incomplete: false,
 				suggestions: [{
 					label: doc.getWordUntilPosition(pos).word,
-					type: 'property',
+					kind: SuggestionKind.Property,
 					insertText: 'foofoo'
 				}]
 			};
@@ -305,7 +305,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 					incomplete: false,
 					suggestions: [{
 						label: 'My Table',
-						type: 'property',
+						kind: SuggestionKind.Property,
 						insertText: 'My Table'
 					}]
 				};
@@ -354,7 +354,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 					incomplete: false,
 					suggestions: [{
 						label: 'foo.bar',
-						type: 'property',
+						kind: SuggestionKind.Property,
 						insertText: 'foo.bar',
 						overwriteBefore: pos.column - 1
 					}]
@@ -369,7 +369,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 					incomplete: false,
 					suggestions: [{
 						label: 'boom',
-						type: 'property',
+						kind: SuggestionKind.Property,
 						insertText: 'boom',
 						overwriteBefore: doc.getLineContent(pos.lineNumber)[pos.column - 2] === '.' ? 0 : pos.column - 1
 					}]
@@ -463,7 +463,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 					incomplete: true,
 					suggestions: [{
 						label: 'foo',
-						type: 'property',
+						kind: SuggestionKind.Property,
 						insertText: 'foo',
 						overwriteBefore: pos.column - 1
 					}]
@@ -500,7 +500,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 					incomplete: true,
 					suggestions: [{
 						label: 'foo;',
-						type: 'property',
+						kind: SuggestionKind.Property,
 						insertText: 'foo',
 						overwriteBefore: pos.column - 1
 					}]
@@ -547,7 +547,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 					suggestions: [
 						{
 							label: 'foo.bar',
-							type: 'property',
+							kind: SuggestionKind.Property,
 							insertText: 'foo.bar',
 							overwriteBefore: pos.column - 1
 						}
@@ -576,12 +576,12 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 					incomplete: true,
 					suggestions: [{
 						label: 'abc',
-						type: 'property',
+						kind: SuggestionKind.Property,
 						insertText: 'abc',
 						overwriteBefore: pos.column - 1
 					}, {
 						label: 'äbc',
-						type: 'property',
+						kind: SuggestionKind.Property,
 						insertText: 'äbc',
 						overwriteBefore: pos.column - 1
 					}]
@@ -648,7 +648,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 					incomplete: true,
 					suggestions: [{
 						label: 'bar',
-						type: 'property',
+						kind: SuggestionKind.Property,
 						insertText: 'bar',
 						overwriteBefore: 2,
 						additionalTextEdits: [{
@@ -720,7 +720,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 			provideCompletionItems(doc, pos) {
 				return {
 					incomplete: true,
-					suggestions: [{ type: 'folder', label: 'CompleteNot', insertText: 'Incomplete', sortText: 'a', overwriteBefore: pos.column - 1 }],
+					suggestions: [{ kind: SuggestionKind.Folder, label: 'CompleteNot', insertText: 'Incomplete', sortText: 'a', overwriteBefore: pos.column - 1 }],
 					dispose() { disposeA += 1; }
 				};
 			}
@@ -729,7 +729,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 			provideCompletionItems(doc, pos) {
 				return {
 					incomplete: false,
-					suggestions: [{ type: 'folder', label: 'Complete', insertText: 'Complete', sortText: 'z', overwriteBefore: pos.column - 1 }],
+					suggestions: [{ kind: SuggestionKind.Folder, label: 'Complete', insertText: 'Complete', sortText: 'z', overwriteBefore: pos.column - 1 }],
 					dispose() { disposeB += 1; }
 				};
 			},
diff --git a/src/vs/editor/contrib/suggest/wordDistance.ts b/src/vs/editor/contrib/suggest/wordDistance.ts
index 44a163abbf6..c2c417e4443 100644
--- a/src/vs/editor/contrib/suggest/wordDistance.ts
+++ b/src/vs/editor/contrib/suggest/wordDistance.ts
@@ -11,7 +11,7 @@ import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerServ
 import { IPosition } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { find, build, Block } from 'vs/editor/contrib/smartSelect/tokenTree';
-import { ISuggestion } from 'vs/editor/common/modes';
+import { ISuggestion, SuggestionKind } from 'vs/editor/common/modes';
 
 
 export abstract class WordDistance {
@@ -54,7 +54,7 @@ export abstract class WordDistance {
 					if (!wordRanges || !position.equals(editor.getPosition())) {
 						return 0;
 					}
-					if (suggestion.type === 'keyword') {
+					if (suggestion.kind === SuggestionKind.Keyword) {
 						return 2 << 20;
 					}
 					let word = suggestion.label;
diff --git a/src/vs/editor/standalone/browser/standaloneLanguages.ts b/src/vs/editor/standalone/browser/standaloneLanguages.ts
index 879379f59ae..1cac7c56afe 100644
--- a/src/vs/editor/standalone/browser/standaloneLanguages.ts
+++ b/src/vs/editor/standalone/browser/standaloneLanguages.ts
@@ -700,29 +700,29 @@ export interface CompletionItemProvider {
 interface ISuggestion2 extends modes.ISuggestion {
 	_actual: CompletionItem;
 }
-function convertKind(kind: CompletionItemKind): modes.SuggestionType {
+function convertKind(kind: CompletionItemKind): modes.SuggestionKind {
 	switch (kind) {
-		case CompletionItemKind.Method: return 'method';
-		case CompletionItemKind.Function: return 'function';
-		case CompletionItemKind.Constructor: return 'constructor';
-		case CompletionItemKind.Field: return 'field';
-		case CompletionItemKind.Variable: return 'variable';
-		case CompletionItemKind.Class: return 'class';
-		case CompletionItemKind.Interface: return 'interface';
-		case CompletionItemKind.Module: return 'module';
-		case CompletionItemKind.Property: return 'property';
-		case CompletionItemKind.Unit: return 'unit';
-		case CompletionItemKind.Value: return 'value';
-		case CompletionItemKind.Enum: return 'enum';
-		case CompletionItemKind.Keyword: return 'keyword';
-		case CompletionItemKind.Snippet: return 'snippet';
-		case CompletionItemKind.Text: return 'text';
-		case CompletionItemKind.Color: return 'color';
-		case CompletionItemKind.File: return 'file';
-		case CompletionItemKind.Reference: return 'reference';
-		case CompletionItemKind.Folder: return 'folder';
+		case CompletionItemKind.Method: return modes.SuggestionKind.Method;
+		case CompletionItemKind.Function: return modes.SuggestionKind.Function;
+		case CompletionItemKind.Constructor: return modes.SuggestionKind.Constructor;
+		case CompletionItemKind.Field: return modes.SuggestionKind.Field;
+		case CompletionItemKind.Variable: return modes.SuggestionKind.Variable;
+		case CompletionItemKind.Class: return modes.SuggestionKind.Class;
+		case CompletionItemKind.Interface: return modes.SuggestionKind.Interface;
+		case CompletionItemKind.Module: return modes.SuggestionKind.Module;
+		case CompletionItemKind.Property: return modes.SuggestionKind.Property;
+		case CompletionItemKind.Unit: return modes.SuggestionKind.Unit;
+		case CompletionItemKind.Value: return modes.SuggestionKind.Value;
+		case CompletionItemKind.Enum: return modes.SuggestionKind.Enum;
+		case CompletionItemKind.Keyword: return modes.SuggestionKind.Keyword;
+		case CompletionItemKind.Snippet: return modes.SuggestionKind.Snippet;
+		case CompletionItemKind.Text: return modes.SuggestionKind.Text;
+		case CompletionItemKind.Color: return modes.SuggestionKind.Color;
+		case CompletionItemKind.File: return modes.SuggestionKind.File;
+		case CompletionItemKind.Reference: return modes.SuggestionKind.Reference;
+		case CompletionItemKind.Folder: return modes.SuggestionKind.Folder;
 	}
-	return 'property';
+	return modes.SuggestionKind.Property;
 }
 
 class SuggestAdapter {
@@ -738,7 +738,7 @@ class SuggestAdapter {
 			_actual: item,
 			label: item.label,
 			insertText: item.label,
-			type: convertKind(item.kind),
+			kind: convertKind(item.kind),
 			detail: item.detail,
 			documentation: item.documentation,
 			command: item.command,
diff --git a/src/vs/workbench/api/node/extHostLanguageFeatures.ts b/src/vs/workbench/api/node/extHostLanguageFeatures.ts
index 535eac548a4..5aac71c8638 100644
--- a/src/vs/workbench/api/node/extHostLanguageFeatures.ts
+++ b/src/vs/workbench/api/node/extHostLanguageFeatures.ts
@@ -665,7 +665,7 @@ class SuggestAdapter {
 			_parentId,
 			//
 			label: item.label,
-			type: typeConvert.CompletionItemKind.from(item.kind),
+			kind: typeConvert.CompletionItemKind.from(item.kind),
 			detail: item.detail,
 			documentation: item.documentation,
 			filterText: item.filterText,
diff --git a/src/vs/workbench/api/node/extHostTypeConverters.ts b/src/vs/workbench/api/node/extHostTypeConverters.ts
index a16e175019f..45b73c462ff 100644
--- a/src/vs/workbench/api/node/extHostTypeConverters.ts
+++ b/src/vs/workbench/api/node/extHostTypeConverters.ts
@@ -479,43 +479,66 @@ export namespace CompletionContext {
 
 export const CompletionItemKind = {
 
-	from(kind: types.CompletionItemKind): modes.SuggestionType {
+	from(kind: types.CompletionItemKind): modes.SuggestionKind {
 		switch (kind) {
-			case types.CompletionItemKind.Method: return 'method';
-			case types.CompletionItemKind.Function: return 'function';
-			case types.CompletionItemKind.Constructor: return 'constructor';
-			case types.CompletionItemKind.Field: return 'field';
-			case types.CompletionItemKind.Variable: return 'variable';
-			case types.CompletionItemKind.Class: return 'class';
-			case types.CompletionItemKind.Interface: return 'interface';
-			case types.CompletionItemKind.Struct: return 'struct';
-			case types.CompletionItemKind.Module: return 'module';
-			case types.CompletionItemKind.Property: return 'property';
-			case types.CompletionItemKind.Unit: return 'unit';
-			case types.CompletionItemKind.Value: return 'value';
-			case types.CompletionItemKind.Constant: return 'constant';
-			case types.CompletionItemKind.Enum: return 'enum';
-			case types.CompletionItemKind.EnumMember: return 'enum-member';
-			case types.CompletionItemKind.Keyword: return 'keyword';
-			case types.CompletionItemKind.Snippet: return 'snippet';
-			case types.CompletionItemKind.Text: return 'text';
-			case types.CompletionItemKind.Color: return 'color';
-			case types.CompletionItemKind.File: return 'file';
-			case types.CompletionItemKind.Reference: return 'reference';
-			case types.CompletionItemKind.Folder: return 'folder';
-			case types.CompletionItemKind.Event: return 'event';
-			case types.CompletionItemKind.Operator: return 'operator';
-			case types.CompletionItemKind.TypeParameter: return 'type-parameter';
+			case types.CompletionItemKind.Method: return modes.SuggestionKind.Method;
+			case types.CompletionItemKind.Function: return modes.SuggestionKind.Function;
+			case types.CompletionItemKind.Constructor: return modes.SuggestionKind.Constructor;
+			case types.CompletionItemKind.Field: return modes.SuggestionKind.Field;
+			case types.CompletionItemKind.Variable: return modes.SuggestionKind.Variable;
+			case types.CompletionItemKind.Class: return modes.SuggestionKind.Class;
+			case types.CompletionItemKind.Interface: return modes.SuggestionKind.Interface;
+			case types.CompletionItemKind.Struct: return modes.SuggestionKind.Struct;
+			case types.CompletionItemKind.Module: return modes.SuggestionKind.Module;
+			case types.CompletionItemKind.Property: return modes.SuggestionKind.Property;
+			case types.CompletionItemKind.Unit: return modes.SuggestionKind.Unit;
+			case types.CompletionItemKind.Value: return modes.SuggestionKind.Value;
+			case types.CompletionItemKind.Constant: return modes.SuggestionKind.Constant;
+			case types.CompletionItemKind.Enum: return modes.SuggestionKind.Enum;
+			case types.CompletionItemKind.EnumMember: return modes.SuggestionKind.EnumMember;
+			case types.CompletionItemKind.Keyword: return modes.SuggestionKind.Keyword;
+			case types.CompletionItemKind.Snippet: return modes.SuggestionKind.Snippet;
+			case types.CompletionItemKind.Text: return modes.SuggestionKind.Text;
+			case types.CompletionItemKind.Color: return modes.SuggestionKind.Color;
+			case types.CompletionItemKind.File: return modes.SuggestionKind.File;
+			case types.CompletionItemKind.Reference: return modes.SuggestionKind.Reference;
+			case types.CompletionItemKind.Folder: return modes.SuggestionKind.Folder;
+			case types.CompletionItemKind.Event: return modes.SuggestionKind.Event;
+			case types.CompletionItemKind.Operator: return modes.SuggestionKind.Operator;
+			case types.CompletionItemKind.TypeParameter: return modes.SuggestionKind.TypeParameter;
 		}
-		return 'property';
+		return modes.SuggestionKind.Property;
 	},
 
-	to(type: modes.SuggestionType): types.CompletionItemKind {
-		if (!type) {
-			return types.CompletionItemKind.Property;
-		} else {
-			return types.CompletionItemKind[type.charAt(0).toUpperCase() + type.substr(1)];
+	to(kind: modes.SuggestionKind): types.CompletionItemKind {
+		switch (kind) {
+			case modes.SuggestionKind.Method: return types.CompletionItemKind.Method;
+			case modes.SuggestionKind.Function: return types.CompletionItemKind.Function;
+			case modes.SuggestionKind.Constructor: return types.CompletionItemKind.Constructor;
+			case modes.SuggestionKind.Field: return types.CompletionItemKind.Field;
+			case modes.SuggestionKind.Variable: return types.CompletionItemKind.Variable;
+			case modes.SuggestionKind.Class: return types.CompletionItemKind.Class;
+			case modes.SuggestionKind.Interface: return types.CompletionItemKind.Interface;
+			case modes.SuggestionKind.Struct: return types.CompletionItemKind.Struct;
+			case modes.SuggestionKind.Module: return types.CompletionItemKind.Module;
+			case modes.SuggestionKind.Property: return types.CompletionItemKind.Property;
+			case modes.SuggestionKind.Unit: return types.CompletionItemKind.Unit;
+			case modes.SuggestionKind.Value: return types.CompletionItemKind.Value;
+			case modes.SuggestionKind.Constant: return types.CompletionItemKind.Constant;
+			case modes.SuggestionKind.Enum: return types.CompletionItemKind.Enum;
+			case modes.SuggestionKind.EnumMember: return types.CompletionItemKind.EnumMember;
+			case modes.SuggestionKind.Keyword: return types.CompletionItemKind.Keyword;
+			case modes.SuggestionKind.Snippet: return types.CompletionItemKind.Snippet;
+			case modes.SuggestionKind.Text: return types.CompletionItemKind.Text;
+			case modes.SuggestionKind.Color: return types.CompletionItemKind.Color;
+			case modes.SuggestionKind.File: return types.CompletionItemKind.File;
+			case modes.SuggestionKind.Reference: return types.CompletionItemKind.Reference;
+			case modes.SuggestionKind.Folder: return types.CompletionItemKind.Folder;
+			case modes.SuggestionKind.Event: return types.CompletionItemKind.Event;
+			case modes.SuggestionKind.Operator: return types.CompletionItemKind.Operator;
+			case modes.SuggestionKind.TypeParameter: return types.CompletionItemKind.TypeParameter;
 		}
+		return types.CompletionItemKind.Property;
 	}
 };
 
@@ -524,7 +547,7 @@ export namespace Suggest {
 	export function to(position: types.Position, suggestion: modes.ISuggestion): types.CompletionItem {
 		const result = new types.CompletionItem(suggestion.label);
 		result.insertText = suggestion.insertText;
-		result.kind = CompletionItemKind.to(suggestion.type);
+		result.kind = CompletionItemKind.to(suggestion.kind);
 		result.detail = suggestion.detail;
 		result.documentation = htmlContent.isMarkdownString(suggestion.documentation) ? MarkdownString.to(suggestion.documentation) : suggestion.documentation;
 		result.sortText = suggestion.sortText;
diff --git a/src/vs/workbench/parts/codeEditor/browser/suggestEnabledInput.ts b/src/vs/workbench/parts/codeEditor/browser/suggestEnabledInput.ts
index e83130e8cbd..aaf1d0a0b61 100644
--- a/src/vs/workbench/parts/codeEditor/browser/suggestEnabledInput.ts
+++ b/src/vs/workbench/parts/codeEditor/browser/suggestEnabledInput.ts
@@ -185,7 +185,7 @@ export class SuggestEnabledInput extends Widget implements IThemable {
 							insertText: result,
 							overwriteBefore: alreadyTypedCount,
 							sortText: validatedSuggestProvider.sortKey(result),
-							type: <modes.SuggestionType>'keyword'
+							kind: modes.SuggestionKind.Keyword
 						};
 					})
 				};
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugSession.ts b/src/vs/workbench/parts/debug/electron-browser/debugSession.ts
index e24b715089c..eb031d3da50 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugSession.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugSession.ts
@@ -10,7 +10,7 @@ import * as platform from 'vs/base/common/platform';
 import severity from 'vs/base/common/severity';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Event, Emitter } from 'vs/base/common/event';
-import { ISuggestion } from 'vs/editor/common/modes';
+import { ISuggestion, suggestionKindFromLegacyString } from 'vs/editor/common/modes';
 import { Position } from 'vs/editor/common/core/position';
 import * as aria from 'vs/base/browser/ui/aria/aria';
 import { IDebugSession, IConfig, IThread, IRawModelUpdate, IDebugService, IRawStoppedDetails, State, LoadedSourceEvent, IFunctionBreakpoint, IExceptionBreakpoint, ActualBreakpoints, IBreakpoint, IExceptionInfo, AdapterEndEvent, IDebugger } from 'vs/workbench/parts/debug/common/debug';
@@ -461,7 +461,7 @@ export class DebugSession implements IDebugSession {
 							result.push({
 								label: item.label,
 								insertText: item.text || item.label,
-								type: item.type,
+								kind: suggestionKindFromLegacyString(item.type),
 								filterText: item.start && item.length && text.substr(item.start, item.length).concat(item.label),
 								overwriteBefore: item.length || overwriteBefore
 							});
diff --git a/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts b/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts
index f28b870a1df..4eae4f099e6 100644
--- a/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts
+++ b/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts
@@ -14,7 +14,7 @@ import { compare, endsWith, isFalsyOrWhitespace } from 'vs/base/common/strings';
 import { URI } from 'vs/base/common/uri';
 import { Position } from 'vs/editor/common/core/position';
 import { ITextModel } from 'vs/editor/common/model';
-import { ISuggestion, ISuggestResult, ISuggestSupport, LanguageId, SuggestContext, SuggestionType } from 'vs/editor/common/modes';
+import { ISuggestion, ISuggestResult, ISuggestSupport, LanguageId, SuggestContext, SuggestionKind } from 'vs/editor/common/modes';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { SnippetParser } from 'vs/editor/contrib/snippet/snippetParser';
 import { setSnippetSuggestSupport } from 'vs/editor/contrib/suggest/suggest';
@@ -345,7 +345,7 @@ export class SnippetSuggestion implements ISuggestion {
 	overwriteBefore: number;
 	sortText: string;
 	noAutoAccept: boolean;
-	type: SuggestionType;
+	kind: SuggestionKind;
 	insertTextIsSnippet: true;
 
 	constructor(
@@ -358,7 +358,7 @@ export class SnippetSuggestion implements ISuggestion {
 		this.overwriteBefore = overwriteBefore;
 		this.sortText = `${snippet.snippetSource === SnippetSource.Extension ? 'z' : 'a'}-${snippet.prefix}`;
 		this.noAutoAccept = true;
-		this.type = 'snippet';
+		this.kind = SuggestionKind.Snippet;
 		this.insertTextIsSnippet = true;
 	}