Make terminology consistent between system and harvesting