Area name not reflecting properly

I think it is considered a hack, but it solved the problem of not getting Area.name updated.
The fix that I put in actually use the current name if no other area object are to be found.