refactor:rename class; extract class.