refactor class naming