Add prefixes to enum values and fix style issues