some terminology changes