Some box/slice renaming.

1 job for master in 10 minutes and 29 seconds