Merge pull request #567 from alex/filename-match

Make the filename match