Use system names instead of numbers