Yet another attempt to get name formatting correct