Rename modules -> collection
Recursively simplify expressions