Changed some file names to make them consistent