changed WAF's names