naming&doc fix