rename handler, add a few consts for RID types