Find packages as well

Collections have priority over packages when there's
ambiguity. This keeps the existing behavior for "rfc"
on collection names that overlap with a package name.