[Update] Minor naming adjustments