Cleanups: Renamed vars and other minor changes to align with Evernote

This eases picking the next commits.
Cleanup: gathered templates in a single location