Changed returned template context variable names and types.