Merge PHPDoc from master & update class names