rework names

Created by  Bowei Liu  on October 12, 2020
D56DDDEJPJZ2PA55BSYVLTZHVBLNPK2STRYYQSMPFCPJASEXVFXQC
Change contents