Fix file names

Minimal changes.  Make file names camel case.