Rename parameters
Add tests (and fix ones that broke)