Last change of naming - closes #59
New naming