Change class naming