Removed '_' from file names

And changed all references.