Escape hyphen in names which breaks scan()