Code refactoring : renamed classes