Use generic template variables in all commands. Closes #3