Improve name formatting