Update for new unambiguous names in doc-ock-lib
little fixups for package types and unary any type variables