Minor revisions to names, add some missing members