Added tracking via object reference.

Retains original API where name can be used, and that name can be
changed at any point (inefficient but retains API).