Renamed Box-specific data classes