some naming fixed
some naming fixed