Fixed some methods names