fixed some terminology stuff and class references