fixed system names and labels