more name fixing