Refactoring: url constants now uppercase