Fixed object names to something more general