Rename box type

I tried to make sure to keep 'box' where it made sense, and alter comments so they still make sense.

r? @pcwalton