diff --git a/extensions/typescript-language-features/src/features/completions.ts b/extensions/typescript-language-features/src/features/completions.ts
index e2f8ba9fd37..6758b85b0f6 100644
--- a/extensions/typescript-language-features/src/features/completions.ts
+++ b/extensions/typescript-language-features/src/features/completions.ts
@@ -216,7 +216,7 @@ class MyCompletionItem extends vscode.CompletionItem {
 			case PConst.Kind.function:
 			case PConst.Kind.localFunction:
 				return vscode.CompletionItemKind.Function;
-			case PConst.Kind.memberFunction:
+			case PConst.Kind.method:
 			case PConst.Kind.constructSignature:
 			case PConst.Kind.callSignature:
 			case PConst.Kind.indexSignature:
@@ -272,7 +272,7 @@ class MyCompletionItem extends vscode.CompletionItem {
 			case PConst.Kind.memberVariable:
 			case PConst.Kind.class:
 			case PConst.Kind.function:
-			case PConst.Kind.memberFunction:
+			case PConst.Kind.method:
 			case PConst.Kind.keyword:
 			case PConst.Kind.parameter:
 				commitCharacters.push('.', ',', ';');
diff --git a/extensions/typescript-language-features/src/features/documentSymbol.ts b/extensions/typescript-language-features/src/features/documentSymbol.ts
index 02c1be917d3..e119b005bab 100644
--- a/extensions/typescript-language-features/src/features/documentSymbol.ts
+++ b/extensions/typescript-language-features/src/features/documentSymbol.ts
@@ -16,7 +16,7 @@ const getSymbolKind = (kind: string): vscode.SymbolKind => {
 		case PConst.Kind.class: return vscode.SymbolKind.Class;
 		case PConst.Kind.enum: return vscode.SymbolKind.Enum;
 		case PConst.Kind.interface: return vscode.SymbolKind.Interface;
-		case PConst.Kind.memberFunction: return vscode.SymbolKind.Method;
+		case PConst.Kind.method: return vscode.SymbolKind.Method;
 		case PConst.Kind.memberVariable: return vscode.SymbolKind.Property;
 		case PConst.Kind.memberGetAccessor: return vscode.SymbolKind.Property;
 		case PConst.Kind.memberSetAccessor: return vscode.SymbolKind.Property;
diff --git a/extensions/typescript-language-features/src/features/implementationsCodeLens.ts b/extensions/typescript-language-features/src/features/implementationsCodeLens.ts
index f7e325c819d..c6ea7ca6dee 100644
--- a/extensions/typescript-language-features/src/features/implementationsCodeLens.ts
+++ b/extensions/typescript-language-features/src/features/implementationsCodeLens.ts
@@ -75,7 +75,7 @@ export default class TypeScriptImplementationsCodeLensProvider extends TypeScrip
 				return getSymbolRange(document, item);
 
 			case PConst.Kind.class:
-			case PConst.Kind.memberFunction:
+			case PConst.Kind.method:
 			case PConst.Kind.memberVariable:
 			case PConst.Kind.memberGetAccessor:
 			case PConst.Kind.memberSetAccessor:
diff --git a/extensions/typescript-language-features/src/features/referencesCodeLens.ts b/extensions/typescript-language-features/src/features/referencesCodeLens.ts
index 7aa228f8f8e..0cf8d3f0a51 100644
--- a/extensions/typescript-language-features/src/features/referencesCodeLens.ts
+++ b/extensions/typescript-language-features/src/features/referencesCodeLens.ts
@@ -94,7 +94,7 @@ export class TypeScriptReferencesCodeLensProvider extends TypeScriptBaseCodeLens
 			case PConst.Kind.enum:
 				return getSymbolRange(document, item);
 
-			case PConst.Kind.memberFunction:
+			case PConst.Kind.method:
 			case PConst.Kind.memberGetAccessor:
 			case PConst.Kind.memberSetAccessor:
 			case PConst.Kind.constructorImplementation:
diff --git a/extensions/typescript-language-features/src/features/workspaceSymbols.ts b/extensions/typescript-language-features/src/features/workspaceSymbols.ts
index 8d6788a4254..cf7724970c6 100644
--- a/extensions/typescript-language-features/src/features/workspaceSymbols.ts
+++ b/extensions/typescript-language-features/src/features/workspaceSymbols.ts
@@ -9,15 +9,21 @@ import { ITypeScriptServiceClient } from '../typescriptService';
 import * as fileSchemes from '../utils/fileSchemes';
 import { doesResourceLookLikeAJavaScriptFile, doesResourceLookLikeATypeScriptFile } from '../utils/languageDescription';
 import * as typeConverters from '../utils/typeConverters';
+import * as PConst from '../protocol.const';
 
 function getSymbolKind(item: Proto.NavtoItem): vscode.SymbolKind {
 	switch (item.kind) {
-		case 'method': return vscode.SymbolKind.Method;
-		case 'enum': return vscode.SymbolKind.Enum;
-		case 'function': return vscode.SymbolKind.Function;
-		case 'class': return vscode.SymbolKind.Class;
-		case 'interface': return vscode.SymbolKind.Interface;
-		case 'var': return vscode.SymbolKind.Variable;
+		case PConst.Kind.method: return vscode.SymbolKind.Method;
+		case PConst.Kind.enum: return vscode.SymbolKind.Enum;
+		case PConst.Kind.enumMember: return vscode.SymbolKind.EnumMember;
+		case PConst.Kind.function: return vscode.SymbolKind.Function;
+		case PConst.Kind.class: return vscode.SymbolKind.Class;
+		case PConst.Kind.interface: return vscode.SymbolKind.Interface;
+		case PConst.Kind.type: return vscode.SymbolKind.Class;
+		case PConst.Kind.memberVariable: return vscode.SymbolKind.Field;
+		case PConst.Kind.memberGetAccessor: return vscode.SymbolKind.Field;
+		case PConst.Kind.memberSetAccessor: return vscode.SymbolKind.Field;
+		case PConst.Kind.variable: return vscode.SymbolKind.Variable;
 		default: return vscode.SymbolKind.Variable;
 	}
 }
diff --git a/extensions/typescript-language-features/src/protocol.const.ts b/extensions/typescript-language-features/src/protocol.const.ts
index a44c175f295..37fe42fd830 100644
--- a/extensions/typescript-language-features/src/protocol.const.ts
+++ b/extensions/typescript-language-features/src/protocol.const.ts
@@ -21,7 +21,7 @@ export class Kind {
 	public static readonly let = 'let';
 	public static readonly localFunction = 'local function';
 	public static readonly localVariable = 'local var';
-	public static readonly memberFunction = 'method';
+	public static readonly method = 'method';
 	public static readonly memberGetAccessor = 'getter';
 	public static readonly memberSetAccessor = 'setter';
 	public static readonly memberVariable = 'property';
diff --git a/extensions/typescript-language-features/src/utils/typeConverters.ts b/extensions/typescript-language-features/src/utils/typeConverters.ts
index 0026eaa1232..78333b2da0b 100644
--- a/extensions/typescript-language-features/src/utils/typeConverters.ts
+++ b/extensions/typescript-language-features/src/utils/typeConverters.ts
@@ -107,7 +107,7 @@ export namespace SymbolKind {
 			case PConst.Kind.interface: return vscode.SymbolKind.Interface;
 			case PConst.Kind.indexSignature: return vscode.SymbolKind.Method;
 			case PConst.Kind.callSignature: return vscode.SymbolKind.Method;
-			case PConst.Kind.memberFunction: return vscode.SymbolKind.Method;
+			case PConst.Kind.method: return vscode.SymbolKind.Method;
 			case PConst.Kind.memberVariable: return vscode.SymbolKind.Property;
 			case PConst.Kind.memberGetAccessor: return vscode.SymbolKind.Property;
 			case PConst.Kind.memberSetAccessor: return vscode.SymbolKind.Property;