Fixing names to include surnames where appropriate.