Fix the definition of surname