Fix major problem with make-string name collision