Template component variable names refactored
work-in-progress commit