Renaming arguments and fixing related PhpDocs