[Java] Refactoring

Remane some classes in order to have accurate names