Make the filename match
Rewrite this to be more streamlined
Merge pull request #567 from alex/filename-match

Make the filename match