Refactored the name