change naming scheme to be more regular
fix bug with same name for checkboxes on the same row