Updated box naming convention