Small name changes to match new names in the framework