Rename for consistency with module name
Update filename
Improved sumExpr macro
Merge conflict...