Refactored name