diff --git a/Tools/autotest/logger_metadata/enum_parse.py b/Tools/autotest/logger_metadata/enum_parse.py
index 3f37a9837f..0a5f76dbd9 100755
--- a/Tools/autotest/logger_metadata/enum_parse.py
+++ b/Tools/autotest/logger_metadata/enum_parse.py
@@ -168,7 +168,7 @@ class EnumDocco(object):
                         continue
 
                     # // @LoggerEnum: NAME  -  can be used around for #define sets
-                    m = re.match(r".*@LoggerEnum: *([\w]+)", line)
+                    m = re.match(r".*@LoggerEnum: *([\w:]+)", line)
                     if m is not None:
                         enum_name = m.group(1)
                         debug("%s: %s" % (source_file, enum_name))
@@ -180,6 +180,9 @@ class EnumDocco(object):
 
                     continue
                 if state == "inside":
+                    if re.match(r"\s*enum.*$", line):
+                        # Allow @LoggerEnum around Enum for name override
+                        continue
                     if re.match(r"\s*$", line):
                         continue
                     if re.match(r"#if", line):