Merge "Typo in backwards compat names for notification drivers"