Change terminology (being OCD...).