refactoring for new Class names