Code refactoring - renamed classes