Fix suffixes so it works with current dashboards