Merge "Rename a method to avoid camel case."