Storage Box name fixes