Adopt new conventions for AddIdentity