Minor name changes and comments