Fix case insensitive predicates
Rename