minor terminology changes