Rename ButtonOnOff to ButtonBoolean