Rename some options

I hope this makes the names more consistent.