rename and make a few grammar fixes