Entity models renaming. Cleanup solution.