Rename to follow file name convention