Refactor of code after class rename.