Fixed some methods name missmatch