Rename IdentityLocator -> ObjectIdentifier