Hotfixing broken object names, and a fix for PHP 5.3.
Merge branch 'hotfix/0.4.6.1'