Update notes for submitted changes

* Use @PluginDomain in a few places.
Update notes for submitted changes

* Use @PluginDomain everywhere else.