Update docblocks to match new class name.
Update docblocks and return strings to new class name.
Update docblocks and return strings to match new class name.
Update docblocks and return strings to match new class name.