Fix wirenames mismatches for templates