updated naming for consistency