Changed names to ids