Change matching system to id system, rather than names system