[REFACTOR] change variable namings