slight cleanup
box/rows renames