Updated the names based on code review