Tweaked name parts and added sort