small lib refactoring
Template component variable names refactored