fix errors
rename methods