Use uniform naming