reset some names per CHEF-4763

These will need to be updated when the internal names are changed.