Modify tooltips to use new helper