Refactoring - Some names of classes changed