Switch consoles to use the new CLI stuff
Switch devices to use the new CLI stuff