updated some terminologies/definitions