Fix residual issues remaining from name change.