Renaming Entitiy to Entity. Again.