Consistent notation. Fix #48