Fixed wrong resolution of object names.