Swapped the name and id fields (id should go away eventually, just there to debug right now).