Refactor and rename
Rename alternative template, update titles