Follow-up correction for Bug 5462 - Fix variable names for template::toolkit