some renaming
some more renaming + docs