Refactor: avoid common names using