Prevent name param from overwriting file if both are passed
Merge pull request #1716 from ricog/schema-name-and-file

SchemaShell: Prevent name param from overwriting file param if both are passed

Fixes #4134.