Rename NoteCollection to Notebook

A few cleanups as well.