Update notes for submitted changes

* Renamed cli files for consistency