major renaming, new classes