Tweak box names