Refactored namings