Minor name and documentation changes