changed some terminology