File API name/ID cleaning issue #354

please take a look, the same thing will be applied to other objects.

Thanx