fix some methods naming