cleaned auto generated names, fixes #1651