Varaible name refactor