Improve naming of templates
testing editor
Merge https://github.com/erasaur/survivor