modify some terminologies