cleaned up some terminology