Reuse and rename devices?

[grumps]

Instead of searching and selecting the same device (TV, for example) for each A/B/C activity can you select a device already configured for reuse in a new activity?  This would help retain the same color for the device across activities, too, I'd assume.

And is there any way to rename the devices once set up?  i.e. I have a Yamaha receiver/surround-sound system that's forever named "Yamaha."  Can I rename it to AV or Surround Sound?  Or change "Samsung" to "TV?"

Thanks