diff --git a/grammars/pseudocode.cson b/grammars/pseudocode.cson
index 8df62910039b588291cd199a351bd7754aff59a2..52f6e4628ad8c775a3c562f428a9ed69f1c65223 100644
--- a/grammars/pseudocode.cson
+++ b/grammars/pseudocode.cson
@@ -8,7 +8,11 @@ foldingStopMarker: "\\*\\*/|^\\s*\\}"
 name: "pseudocode"
 patterns: [
   {
-      match: "REQUIRE|ENSURE|EXTENDS|ABSTRACT"
+    match: " [A-Z][a-z][a-zA-Z0-9]*"
+    name: "entity.other.attribute-name.pseudocode"
+   },
+  {
+      match: "REQUIRE|ENSURE"
       name: "entity.name.tag.pseudocode"
   },
   {
@@ -51,18 +55,18 @@ patterns: [
     match: "(END )?CLASS"
     name: "entity.name.class.pseudocode"
   },
+  {
+    match: "EXTENDS|ABSTRACT"
+    name: "entity.name.class.pseudocode"
+  },
   {
     match: "THIS"
-    name: "entity.other.attribute-name.pseudocode"
+    name: "entity.name.tag.pseudocode"
   },
   {
     match: "INPUT|OUTPUT"
     name: "support.function.pseudocode"
   },
-  {
-    match: "String|Int|Float|Map|List|Set"
-    name: "entity.other.attribute-name.pseudocode"
-   },
   {
     match: "<=|>=|<>|!=|==|>|≠|<"
     name: "punctuation.definition.bold.pseudocode"
@@ -134,6 +138,6 @@ patterns: [
         name: "constant.character.escape.pseudocode"
       }
     ]
-  }
+  },
 ]
 scopeName: "source.pseudocode"