Refined vocabulary. Fix #18.