Modified names for uniformity