renaming and doc changes