update id to use underscore