Update file names to match conventions