Correcting some methods name and commentaries