diff --git a/extensions/typescript/src/features/completionItemProvider.ts b/extensions/typescript/src/features/completionItemProvider.ts
index 90d8eb14ba5..9a4ad7c1f7d 100644
--- a/extensions/typescript/src/features/completionItemProvider.ts
+++ b/extensions/typescript/src/features/completionItemProvider.ts
@@ -59,17 +59,19 @@ class MyCompletionItem extends CompletionItem {
 			case PConst.Kind.let:
 			case PConst.Kind.variable:
 			case PConst.Kind.localVariable:
+			case PConst.Kind.alias:
 				return CompletionItemKind.Variable;
 			case PConst.Kind.memberVariable:
 			case PConst.Kind.memberGetAccessor:
 			case PConst.Kind.memberSetAccessor:
 				return CompletionItemKind.Field;
 			case PConst.Kind.function:
+				return CompletionItemKind.Function;
 			case PConst.Kind.memberFunction:
 			case PConst.Kind.constructSignature:
 			case PConst.Kind.callSignature:
 			case PConst.Kind.indexSignature:
-				return CompletionItemKind.Function;
+				return CompletionItemKind.Method;
 			case PConst.Kind.enum:
 				return CompletionItemKind.Enum;
 			case PConst.Kind.module:
@@ -87,7 +89,6 @@ class MyCompletionItem extends CompletionItem {
 			case PConst.Kind.directory:
 				return CompletionItemKind.Folder;
 		}
-
 		return CompletionItemKind.Property;
 	}
 
diff --git a/extensions/typescript/src/protocol.const.ts b/extensions/typescript/src/protocol.const.ts
index 9324ad6a487..f7a0b0213a8 100644
--- a/extensions/typescript/src/protocol.const.ts
+++ b/extensions/typescript/src/protocol.const.ts
@@ -6,34 +6,31 @@
 'use strict';
 
 export class Kind {
-	public static unknown = '';
-	public static keyword = 'keyword';
-	public static script = 'script';
-	public static module = 'module';
-	public static class = 'class';
-	public static interface = 'interface';
-	public static type = 'type';
-	public static enum = 'enum';
-	public static variable = 'var';
-	public static localVariable = 'local var';
-	public static function = 'function';
-	public static localFunction = 'local function';
-	public static memberFunction = 'method';
-	public static memberGetAccessor = 'getter';
-	public static memberSetAccessor = 'setter';
-	public static memberVariable = 'property';
-	public static constructorImplementation = 'constructor';
-	public static callSignature = 'call';
-	public static indexSignature = 'index';
-	public static constructSignature = 'construct';
-	public static parameter = 'parameter';
-	public static typeParameter = 'type parameter';
-	public static primitiveType = 'primitive type';
-	public static alias = 'alias';
-	public static const = 'const';
-	public static let = 'let';
-	public static warning = 'warning';
-	public static directory = 'directory';
-	public static file = 'file';
-	public static externalModuleName = 'external module name';
+	public static readonly alias = 'alias';
+	public static readonly callSignature = 'call';
+	public static readonly class = 'class';
+	public static readonly const = 'const';
+	public static readonly constructorImplementation = 'constructor';
+	public static readonly constructSignature = 'construct';
+	public static readonly directory = 'directory';
+	public static readonly enum = 'enum';
+	public static readonly externalModuleName = 'external module name';
+	public static readonly file = 'file';
+	public static readonly function = 'function';
+	public static readonly indexSignature = 'index';
+	public static readonly interface = 'interface';
+	public static readonly keyword = 'keyword';
+	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 memberGetAccessor = 'getter';
+	public static readonly memberSetAccessor = 'setter';
+	public static readonly memberVariable = 'property';
+	public static readonly module = 'module';
+	public static readonly primitiveType = 'primitive type';
+	public static readonly script = 'script';
+	public static readonly type = 'type';
+	public static readonly variable = 'var';
+	public static readonly warning = 'warning';
 }