Number of comment/doc block updates and naming changes