Make sure all terms defined in 3.3 are quoted. The current state is inconsistent.

Issue done.