Consolidate "tivo_names" and "tivo_ports" into "tivos"; (temporarily?)