Fix some template substitution variable names for consistency