use consistent naming
add RCLASS_M_TBL_WRAPPER; copy RCLASS_M_TBL_WRAPPER into iclass