Rename

Update to align with renamed pesonas and objects.