removed header as include
changed template variable names