Changed predicate names to underscore.