Avoid using fully qualified names within the code
Merge pull request #5079 from GrahamCampbell/4.2-names

[4.2] Avoid Using Fully Qualified Names Within The Code