Improved consistency of documentation; changed PHPDoc comments to always use the resolved name.