Add ResourceDiscoveryCallback to fix product name change