Fix a few things missed in the rename