userIdentifier renamed to ipAddress uniformly