some mod on naming