Fixes from the name change.