Renamed the 6rd type to generic tunnel.