more renaming and more docs ...