diff --git a/src/main/java/app/model/languages/Java.java b/src/main/java/app/model/languages/Java.java
index b4675d1..9d269ca 100644
--- a/src/main/java/app/model/languages/Java.java
+++ b/src/main/java/app/model/languages/Java.java
@@ -44,7 +44,7 @@ public class Java implements ProgrammingLanguage {
       e("\\[|\\]",                    "squareBrackets"),
       e(";",                          "semicolon"),
       e("\\.\\w+\\b(?!\\()",          "property"),
-      e("[A-Z]\\w+",                  "identifier"),
+      e("\\b[A-Z]\\w+\\b",            "identifier"),
       e("\\b(" + String.join("|", keywords) + ")\\b",
                                       "keyword"),
       e("(?://.*)|(?:\\/?\\s?\\*.*)", "comment")