Rename methods as per CR feedback.