Changed files to have appropriate names