diff --git a/waf/isaserver.py b/waf/isaserver.py
index 6d7369a48..d2e8cdd74 100644
--- a/waf/isaserver.py
+++ b/waf/isaserver.py
@@ -5,10 +5,7 @@ Copyright (c) 2006-2013 sqlmap developers (http://sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
-import re
-
 from lib.core.common import randomInt
-from lib.core.enums import HTTPHEADER
 
 __product__ = "ISA Server (Microsoft)"
 
diff --git a/waf/secureiis.py b/waf/secureiis.py
index 5e099cfbd..541f95668 100644
--- a/waf/secureiis.py
+++ b/waf/secureiis.py
@@ -5,8 +5,6 @@ Copyright (c) 2006-2013 sqlmap developers (http://sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
-import re
-
 from lib.core.enums import HTTPHEADER
 
 __product__ = "SecureIIS Web Server Security (BeyondTrust)"
diff --git a/waf/teros.py b/waf/teros.py
index aaf1a2df8..65a3c28fa 100644
--- a/waf/teros.py
+++ b/waf/teros.py
@@ -9,8 +9,8 @@ import re
 
 from lib.core.enums import HTTPHEADER
 
-__product__ = "ISV Teros Web Application Firewall (Teros/Citrix Systems)"
+__product__ = "Teros/Citrix Application Firewall Enterprise (Teros/Citrix Systems)"
 
 def detect(get_page):
     page, headers, code = get_page()
-    return re.search(r"\Ast8id=", headers.get(HTTPHEADER.SET_COOKIE, ""), re.I) is not None
+    return re.search(r"\Ast8(id|_wat|_wlf)", headers.get(HTTPHEADER.SET_COOKIE, ""), re.I) is not None