Template fixes for variable names