use new type abbreviation in spec
cleanup abbreviations section
code examples
fix another npe for #1152