Bug 17003: (follow-up) Update definitions according to voted RFC