Prep for merge - renamed multisensor to generic (ADH)