Cosmetic changes
Renamed U to Predicate
Input base module