CLC-3194 Rename methods for clarity