refactor class rename