Some renamings +  Documentation changes