PSA: Twice now, I have found resetting HomePods has been required to avoid HomeKit/Airplay 2 confusion after changing or moving hardware — once after switching the AppleTV that uses HomePods for home theater audio, and another after moving set of HomePods to another room.