Refactor the name of Class