fix regular expressions
fix NAMESPACE