Removed dashes and added underscores in template variables.