Fix bug with renamed objects not being found