Changes file names for consistency with the classes they represent