I've just noticed that you mixed up ``$oldname`` and ``$newname`` in your last patch (the behavior is fine, the naming is just confused). Could you change that though?