Class name refactor.