Add 'C' to some sublanguage names; minor corrections and terminology changes.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>