Consistent naming of bundle versus yaml config.