Changed some strings to Name nodes, so they can have annotations
Merge branch 'master' of https://github.com/ruudvanderweijde/php-analysis