minor renaming and doc