Rename switch and fix CLI information