fix wrong string name and wrong location