Rework note state to support harmony.
Stop using mixed underbar and camel case.