fix string, name, qualifiedName #583
optimize a little bit