Refactored code nameing.