Rename collection suffixes for more namespace room.

Suffixes were still carefully chosen here to have the COLL_SUFFIX_KEYS
suffix come before the COLL_SUFFIX_COLL suffix.

See also: 8b539621220dc3526.