Fixed some inline documentation to reflect recent class name changes.