Files refactoring

This commit changes some file names to be according to Apple's name
convention.