fix namespaces and PHP-docs