Hi Marlan,
I do have as well two TWC and I am still having the same issue as you, both appear with the same name. I wanted to fix it in the code you posted, but I can not find the lines. I installed everything two weeks ago, so maybe @CDragon though he fixed it and change the code but the error...