add type to sublists, remove generics from OneTermDev and TwoTermDev lists