Changes several ID's to be type identifier; fixes #220