Rename some methods according to standard