Minor naming adjustments.