#905 Rename template