major renaming, added base box types