Change TeamUpgradesNPC to TeamUpgradesEntity and ItemStoreNPC to ItemStoreEntity. Add aliases to both for backwards compatibility.