4bee1fa builder: avoid 'template' name collision

Authored and Committed by kparal 8 years ago
    builder: avoid 'template' name collision
    
    Also fix a bug when accessing one of the variables.
    
        
file modified
+3 -3