function naming adjustments