[REFACTOR] improve naming consistency