Cleaned up box naming