rename BaseEntity -> Entity