More removal of SET references
Fixes #207
New name