removed hard-coded dependency on object names.  uses lookup service now.