Clean up of method names.