Refactored code to reflect the name change