Merge "Method rename"