diff --git a/src/python/m5/params.py b/src/python/m5/params.py
index c1c6ca9471..da1304d9c6 100644
--- a/src/python/m5/params.py
+++ b/src/python/m5/params.py
@@ -1485,7 +1485,9 @@ class Enum(ParamValue):
         for elem_name in cls.map.keys():
             code('} else if (%s == "%s") {' % (src, elem_name))
             code.indent()
-            code('%s = Enums::%s;' % (dest, elem_name))
+            name = cls.__name__ if cls.enum_name is None else cls.enum_name
+            code('%s = %s::%s;' % (dest, name if cls.is_class else 'Enums',
+                                   elem_name))
             code('%s true;' % ret)
             code.dedent()
         code('} else {')