Google Home has started turning on/off the wrong devices

I have a smarthings hub with 3 leviton light switches connected and 2 GE fan speed control switches. In the google home app the lights have the lightbulb icon by them, and the fans have a generic switch by them. Until recently I have been able to say “turn on/off all of my lights” or “turn on/off bedroom lights” and only the appropriate lights would turn on or off and google would respond with “ok turning on/off 3 lights” or “ok turning off bedroom lights.” Now when I issue the same commands google home turns on/off the lights and the fans and responds with “turning off 5 lights.” If I tell google home to turn on the fans the lights are not turned on. Anyone know how to fix the issue?
Thank You.