Refactored name/path