Update file names according New naming convention
Update class names
Merge pull request #1521 from julionc/rename_filenames

Update file names according New naming convention