fix
rename some methods.