Fixing other places required by the name change
More changes required by the name change.