TODO(jjb): This should really be name?