Minor name/comment changes