[chore]refactor codes

Note: remove duplications and make all domain words consistent