some renaming
documentation update
some more renaming