yep, I didn't want to change this in this patch as this is unrelated, but I agree the naming could be better.

And I also agree that we should have real buttons here. :)

but in a future patch, ok ?