#301 some new and renamed classes