Updated the solution for the new name