Merge "Cleaning up list of common nicknames"