Minor name refactoring, docs