djusting the names of Class