Updated varibale names