fixed errors in WAF's names