Fix naming errors.