Object wrapped fixes, name changes