Refactor variables name in class