Fix bug due to the name change