Refactored lower case names