Rename Expression Predicate context to Simple context