Source API name/ID cleaning issue #354