modify some names which is forgot to rename in previous commit.