Renamed a few ID variables to other names to avoid some conflicts with an existing ID type.
Renamed a few ID variables to other names to avoid some conflicts with an existing ID type.

jfroy/rivenx,jfroy/rivenx,jfroy/rivenx,jfroy/rivenx