Rename ObjectKey to Entity