Refactored the names