Rename for combining 2d corr, bilin and stout
Sync 2d with recent 4d developments, update scalar test suite
Minor accompanying 4d updates