diff --git a/src/TicketSwapErrorFormatter.php b/src/TicketSwapErrorFormatter.php
index 8e8a647..581d457 100644
--- a/src/TicketSwapErrorFormatter.php
+++ b/src/TicketSwapErrorFormatter.php
@@ -221,7 +221,7 @@ public static function highlight(string $message, ?string $tip, ?string $identif
 
         // Full Qualified Class Names
         $message = (string) preg_replace(
-            "/([\\\]?[A-Z0-9]{1}[A-Za-z0-9_\-]+[\\\]+[A-Z0-9]{1}[A-Za-z0-9_\-\\\]+(?:::[A-Za-z0-9_]+)?)/",
+            "/([\\\\]?[A-Z0-9]{1}[A-Za-z0-9_\\-]+[\\\\]+[A-Z0-9]{1}[A-Za-z0-9_\\-\\\\]+(?:::\\w+)?)/",
             '<fg=yellow>$1</>',
             $message,
         );
@@ -249,7 +249,7 @@ public static function highlight(string $message, ?string $tip, ?string $identif
 
         // Class reference (e.g. ClassName::CONSTANT, ClassName::class)
         $message = (string) preg_replace(
-            '/(?<=[\s])([A-Z][A-Za-z0-9_]+::[A-Za-z0-9_]+)(?=[\.\s\|><,\(\)\{\}]|$)/',
+            '/(?<=[\s])([A-Z]\w+::\w+)(?=[\.\s\|><,\(\)\{\}]|$)/',
             '<fg=yellow>$1</>',
             $message,
         );