For ENUM - windowsLogonModule

principal & role both upper case so caller doesn't need to change.
Remainder of final modifiers added

Added final modifiers to remainder of waffle.