More consistent naming
update config to include a pipeline