Deprecate the 'stanza' based names to 'lines' based names [reviewed]