More doc and renames