Rename template names (fixes #13)