Rename variables and add correct config for PHP-5.3