Fixed warnings and rename_predicate/3