[REFACTORING] renamed a lot of classes