One other thing, and sorry I know I'm nit-picking.  We've been moving more things in the flight firmware (except task names) to using the linux C convention of all lower case with underscores for the variable names.  Could you rename these

mav_streams
mav_rates