Rename methods to match update and fit ET needs