changed file names to be more generic