Some more renaming and documenting done.