rename and fix some grammer