renaming & doc updates