converted codebase to uppercase strings
merged from dev branch