Fix id data key names