changed class naming functionality