diff --git a/src/apex/apex.ts b/src/apex/apex.ts
index 7848895b..258172f7 100644
--- a/src/apex/apex.ts
+++ b/src/apex/apex.ts
@@ -211,13 +211,21 @@ export const language = <ILanguage>{
 	tokenizer: {
 		root: [
 			// identifiers and keywords
-			[/[a-zA-Z_$][\w$]*/, {
+			[/[a-z_$][\w$]*/, {
 				cases: {
 					'@keywords': { token: 'keyword.$0' },
 					'@default': 'identifier'
 				}
 			}],
 
+			// assume that identifiers starting with an uppercase letter are types
+			[/[A-Z][\w\$]*/, {
+				cases: {
+					'@keywords': { token: 'keyword.$0' },
+					'@default': 'type.identifier'
+				}
+			}],
+
 			// whitespace
 			{ include: '@whitespace' },