Tune modifier naming in naming page