rename two entity classes back