Class naming refactoring have been applied.