Rename 'on' #220

Closes #220