further rename and refactor

Created by  Bowei Liu  on December 24, 2020
DK5HGACGUWZGNYVDEX3CAOZV3NIWYT5EIXXPX3G3VD2TGYVJ5O2AC
Change contents