+ issue 151: improved consistency of the terminology in different areas.