Changed some file names for ease of use