Normalized method names and parameters. General cleaup.