Docs and some symbol renames for CS