CLEANUP: Renamed modules and predicates.