Reduced enum name size
moved to specific order for files in build; outstanding rename