Refactored config names