Update to changing naming, other corrections.