Adding consistency to terminology.
Standardizing on 'error' for error variables, instead of 'err'.