diff --git a/ldi-orchestrator/ldio-connectors/ldio-amqp/src/main/java/be/vlaanderen/informatievlaanderen/ldes/ldio/config/LdioAmqpOutAutoConfig.java b/ldi-orchestrator/ldio-connectors/ldio-amqp/src/main/java/be/vlaanderen/informatievlaanderen/ldes/ldio/config/LdioAmqpOutAutoConfig.java
index c11f7efc5..7aac96a56 100644
--- a/ldi-orchestrator/ldio-connectors/ldio-amqp/src/main/java/be/vlaanderen/informatievlaanderen/ldes/ldio/config/LdioAmqpOutAutoConfig.java
+++ b/ldi-orchestrator/ldio-connectors/ldio-amqp/src/main/java/be/vlaanderen/informatievlaanderen/ldes/ldio/config/LdioAmqpOutAutoConfig.java
@@ -13,7 +13,6 @@
 
 import static be.vlaanderen.informatievlaanderen.ldes.ldi.rdf.formatter.LdiRdfWriterProperties.RDF_WRITER;
 import static be.vlaanderen.informatievlaanderen.ldes.ldio.config.AmqpConfig.*;
-import static be.vlaanderen.informatievlaanderen.ldes.ldio.config.PipelineConfig.PIPELINE_NAME;
 
 @Configuration
 public class LdioAmqpOutAutoConfig {
@@ -28,7 +27,7 @@ public static class LdioJmsOutConfigurator implements LdioOutputConfigurator {
 
         @Override
         public LdiComponent configure(ComponentProperties config) {
-			final var pipelineName = config.getProperty(PIPELINE_NAME);
+            final var pipelineName = config.getPipelineName();
             final var remoteUrl = new RemoteUrlExtractor(config).getRemoteUrl();
             final var connectionFactory =
                     new JmsConnectionFactory(config.getProperty(USERNAME), config.getProperty(PASSWORD), remoteUrl);
diff --git a/ldi-orchestrator/ldio-connectors/ldio-amqp/src/test/java/be/vlaanderen/informatievlaanderen/ldes/ldio/AmqpOutIntegrationTestSteps.java b/ldi-orchestrator/ldio-connectors/ldio-amqp/src/test/java/be/vlaanderen/informatievlaanderen/ldes/ldio/AmqpOutIntegrationTestSteps.java
index 2080a72b5..5f5b73224 100644
--- a/ldi-orchestrator/ldio-connectors/ldio-amqp/src/test/java/be/vlaanderen/informatievlaanderen/ldes/ldio/AmqpOutIntegrationTestSteps.java
+++ b/ldi-orchestrator/ldio-connectors/ldio-amqp/src/test/java/be/vlaanderen/informatievlaanderen/ldes/ldio/AmqpOutIntegrationTestSteps.java
@@ -4,7 +4,6 @@
 import be.vlaanderen.informatievlaanderen.ldes.ldi.types.LdiOutput;
 import be.vlaanderen.informatievlaanderen.ldes.ldio.config.AmqpConfig;
 import be.vlaanderen.informatievlaanderen.ldes.ldio.config.LdioAmqpOutAutoConfig;
-import be.vlaanderen.informatievlaanderen.ldes.ldio.config.PipelineConfig;
 import be.vlaanderen.informatievlaanderen.ldes.ldio.valueobjects.ComponentProperties;
 import io.cucumber.java.en.And;
 import io.cucumber.java.en.Then;
@@ -42,7 +41,7 @@ public void iCreateAMessageConsumer() throws JMSException {
 
     @And("I create an LdioAmqpOut component")
     public void iCreateAnLdioAmqpOutComponent() {
-        ComponentProperties properties = new ComponentProperties("pipeline", NAME, config);
+        ComponentProperties properties = new ComponentProperties("pipelineName", NAME, config);
         ldioAmqpOut = (LdiOutput) new LdioAmqpOutAutoConfig().ldioConfigurator().configure(properties);
     }
 
@@ -60,7 +59,6 @@ public void iCreateDefaultConfigForLdioAmqpOut() throws JMSException {
         config.put(AmqpConfig.PASSWORD, testContext.activemq.getPassword());
         config.put(AmqpConfig.QUEUE, testContext.queue.getQueueName());
         config.put("rdf-writer." + LdiRdfWriterProperties.CONTENT_TYPE, contentType.getHeaderString());
-        config.put(PipelineConfig.PIPELINE_NAME, "pipelineName");
     }
 
     @Then("I send the model to the LdioAmqpOut component")
diff --git a/ldi-orchestrator/ldio-connectors/ldio-archive-file-in/src/main/java/be/vlaanderen/informatievlaanderen/ldes/ldio/config/LdioArchiveFileInAutoConfig.java b/ldi-orchestrator/ldio-connectors/ldio-archive-file-in/src/main/java/be/vlaanderen/informatievlaanderen/ldes/ldio/config/LdioArchiveFileInAutoConfig.java
index 045a26a38..ab6a353f3 100644
--- a/ldi-orchestrator/ldio-connectors/ldio-archive-file-in/src/main/java/be/vlaanderen/informatievlaanderen/ldes/ldio/config/LdioArchiveFileInAutoConfig.java
+++ b/ldi-orchestrator/ldio-connectors/ldio-archive-file-in/src/main/java/be/vlaanderen/informatievlaanderen/ldes/ldio/config/LdioArchiveFileInAutoConfig.java
@@ -16,8 +16,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import static be.vlaanderen.informatievlaanderen.ldes.ldio.config.PipelineConfig.PIPELINE_NAME;
-
 @Configuration
 public class LdioArchiveFileInAutoConfig {
 	public static final String ARCHIVE_ROOT_DIR_PROP = "archive-root-dir";
@@ -33,7 +31,7 @@ public LdiComponent configure(LdiAdapter adapter,
 					ComponentProperties config) {
 				ArchiveFileCrawler archiveFileCrawler = new ArchiveFileCrawler(getArchiveDirectoryPath(config));
 				Lang hintLang = getSourceFormat(config);
-				String pipelineName = config.getProperty(PIPELINE_NAME);
+				String pipelineName = config.getPipelineName();
 
 				return new LdioArchiveFileIn(pipelineName, executor, observationRegistry, archiveFileCrawler, hintLang);
 			}