WL-3725 : Expand templates if property is set

WL-3725 : Prefix property with toolname