Rename methods

Rename methods