Rename templates files to cloning consistency