rename methods
rename methods 2