Spotify showing serial numbers for Amazon Echos

Installed Spotify integration as well as Alexa Media Player installed. I used to be able to create scenes to play Spotify on select Echos using the Echo name. Now, the names have converted to a serial number and the scenes don’t work. If I play something through the Spotify app on my phone, the serial number in HA will change to the name. But, it will eventually revert to the serial number. Any ideas on how to fix?