Rename template files (continue)