Merge pull request #377 from Masterminds/fix-name-mismatch

Fixes #371: Warn when name/location mismatch