Prepare adding the box' name to the header, remove obsoleted comment