[5.0] Fix DocBlocks

Few DocBlock fixes with inconsistent variable names, return types, and varadics.