rename according to code style