Change the file names to new naming idea