Fix some phpdoc and camelcase