Fixes bad name reference from refactoring
Adds support for signature in predicates