Rename methods
Moved return