refactoring change name variables