Fix naming for consistency