Adapted expected after changing sort names