Enum interface adjustement (closes #4182)