docs and some renaming