Rename some methods according to naming conventions.