Removed '_' from file names

And changed all references.
Merge branch 'master' into gh-pages