Returned old code to name field, didn't first quite understand what was
actually done recently.