Corrected some comments/names