ONEUI CleanUp.
Small change to the INamePicker Interface