fixup! name references in strings