Update file names according New naming convention