File API name/ID cleaning issue #354
Merge pull request #420 from asobolev/master

File API name/ID cleaning issue #354

LGTM