Thank you for clarifying! Yes, for this purpose, upgrades are basically a subset of items that can be collected.
