rename classes in order to be more readable