Use line-specific method names where possible to remove ambiguity and possibility of future clashes
Merge PR #1257 'Use line-specific method names where possible'