Minor name changes and commenting