More fixes as a consequence of name change.