Changed file names to generic names