Rename RID objects to policy handle objects in API