Refactoring gone wrong. Fixed Old name