Improved terminology - closes #4