Update notes for submitted changes

* A lot of trivial renames and obsolete code clean-up.