Also removing some prefixes that we don't need now that we're using enum classes instead of plain enums.