Fixed some file naming conventions