A few small fixes. Revert to old name.