diff --git a/conduit-api/build.gradle b/dataline-api/build.gradle
similarity index 83%
rename from conduit-api/build.gradle
rename to dataline-api/build.gradle
index 61c3cee89b03c..582e88dfb3bfa 100644
--- a/conduit-api/build.gradle
+++ b/dataline-api/build.gradle
@@ -3,16 +3,16 @@ plugins {
     id "java-library"
 }
 
-def specFile = "$projectDir/src/main/openapi/conduit.yaml".toString()
+def specFile = "$projectDir/src/main/openapi/config.yaml".toString()
 
 openApiGenerate {
     generatorName = "jaxrs-spec"
     inputSpec = specFile
     outputDir = "$buildDir/generated".toString()
 
-    apiPackage = "io.dataline.conduit.api"
-    invokerPackage = "io.dataline.conduit.api.invoker"
-    modelPackage = "io.dataline.conduit.api.model"
+    apiPackage = "io.dataline.api"
+    invokerPackage = "io.dataline.api.invoker"
+    modelPackage = "io.dataline.api.model"
 
     generateApiDocumentation = false
 
diff --git a/conduit-api/src/main/openapi/conduit.yaml b/dataline-api/src/main/openapi/config.yaml
similarity index 99%
rename from conduit-api/src/main/openapi/conduit.yaml
rename to dataline-api/src/main/openapi/config.yaml
index ff258cd25869f..c6f049e35e8e5 100644
--- a/conduit-api/src/main/openapi/conduit.yaml
+++ b/dataline-api/src/main/openapi/config.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.0
 info:
   description: |
-    Conduit API
+    Dataline API
     [https://dataline.io](https://dataline.io).
 
     This API is a collection HTTP RPC-style methods. While it is not a REST API, those familiar with REST should find the conventions of this API recognizable.
@@ -20,7 +20,7 @@ info:
       * Adding new HTTP endpoints.
 
   version: "1.0.0-oas3"
-  title: Conduit Configuration API
+  title: Dataline Configuration API
   contact:
     email: contact@dataline.io
   license:
diff --git a/conduit-commons/build.gradle b/dataline-commons/build.gradle
similarity index 100%
rename from conduit-commons/build.gradle
rename to dataline-commons/build.gradle
diff --git a/conduit-commons/src/main/java/io/dataline/conduit/commons/HelloWorld.java b/dataline-commons/src/main/java/io/dataline/commons/HelloWorld.java
similarity index 82%
rename from conduit-commons/src/main/java/io/dataline/conduit/commons/HelloWorld.java
rename to dataline-commons/src/main/java/io/dataline/commons/HelloWorld.java
index 4bbebefa8d565..8e351fdaaf0e7 100644
--- a/conduit-commons/src/main/java/io/dataline/conduit/commons/HelloWorld.java
+++ b/dataline-commons/src/main/java/io/dataline/commons/HelloWorld.java
@@ -1,4 +1,4 @@
-package io.dataline.conduit.commons;
+package io.dataline.commons;
 
 import com.google.common.base.Strings;
 
diff --git a/conduit-commons/src/main/resources/log4j2.xml b/dataline-commons/src/main/resources/log4j2.xml
similarity index 100%
rename from conduit-commons/src/main/resources/log4j2.xml
rename to dataline-commons/src/main/resources/log4j2.xml
diff --git a/conduit-commons/src/test/java/io/dataline/conduit/commons/HelloWorldTest.java b/dataline-commons/src/test/java/io/dataline/commons/HelloWorldTest.java
similarity index 82%
rename from conduit-commons/src/test/java/io/dataline/conduit/commons/HelloWorldTest.java
rename to dataline-commons/src/test/java/io/dataline/commons/HelloWorldTest.java
index b30ae1c6bdb32..357cad9b62bc2 100644
--- a/conduit-commons/src/test/java/io/dataline/conduit/commons/HelloWorldTest.java
+++ b/dataline-commons/src/test/java/io/dataline/commons/HelloWorldTest.java
@@ -1,4 +1,4 @@
-package io.dataline.conduit.commons;
+package io.dataline.commons;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/conduit-config-persistence/build.gradle b/dataline-config-persistence/build.gradle
similarity index 86%
rename from conduit-config-persistence/build.gradle
rename to dataline-config-persistence/build.gradle
index 534e7f9dc62a5..7d7ccdade4345 100644
--- a/conduit-config-persistence/build.gradle
+++ b/dataline-config-persistence/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id "com.diffplug.spotless" version "5.1.1"
 }
 
-group 'io.dataline.conduit'
+group 'io.dataline'
 version '0.1.0'
 
 repositories {
@@ -24,6 +24,6 @@ dependencies {
     compile group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.9.8"
     compile group: "com.networknt", name: "json-schema-validator", version: "1.0.42"
 
-    implementation project(':conduit-config')
+    implementation project(':dataline-config')
 
 }
diff --git a/conduit-config-persistence/src/main/java/io/dataline/conduit/persistence/ConfigPersistence.java b/dataline-config-persistence/src/main/java/io/dataline/config/persistence/ConfigPersistence.java
similarity index 89%
rename from conduit-config-persistence/src/main/java/io/dataline/conduit/persistence/ConfigPersistence.java
rename to dataline-config-persistence/src/main/java/io/dataline/config/persistence/ConfigPersistence.java
index 87a41db79fb43..45cd77d8308c8 100644
--- a/conduit-config-persistence/src/main/java/io/dataline/conduit/persistence/ConfigPersistence.java
+++ b/dataline-config-persistence/src/main/java/io/dataline/config/persistence/ConfigPersistence.java
@@ -1,4 +1,4 @@
-package io.dataline.conduit.persistence;
+package io.dataline.config.persistence;
 
 import java.util.Set;
 
diff --git a/conduit-config-persistence/src/main/java/io/dataline/conduit/persistence/ConfigPersistenceImpl.java b/dataline-config-persistence/src/main/java/io/dataline/config/persistence/ConfigPersistenceImpl.java
similarity index 94%
rename from conduit-config-persistence/src/main/java/io/dataline/conduit/persistence/ConfigPersistenceImpl.java
rename to dataline-config-persistence/src/main/java/io/dataline/config/persistence/ConfigPersistenceImpl.java
index 13054c0201673..c4b80f2b4ed02 100644
--- a/conduit-config-persistence/src/main/java/io/dataline/conduit/persistence/ConfigPersistenceImpl.java
+++ b/dataline-config-persistence/src/main/java/io/dataline/config/persistence/ConfigPersistenceImpl.java
@@ -1,10 +1,13 @@
-package io.dataline.conduit.persistence;
+package io.dataline.config.persistence;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.networknt.schema.*;
-import io.dataline.conduit.conduit_config.ConfigSchema;
-import io.dataline.conduit.conduit_config.StandardScheduleConfiguration;
+import com.networknt.schema.JsonSchema;
+import com.networknt.schema.JsonSchemaFactory;
+import com.networknt.schema.SchemaValidatorsConfig;
+import com.networknt.schema.SpecVersion;
+import com.networknt.schema.ValidationMessage;
+import io.dataline.config.ConfigSchema;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -16,7 +19,7 @@
 
 public class ConfigPersistenceImpl implements ConfigPersistence {
   private static final String CONFIG_STORAGE_ROOT = "data/config/";
-  private static final String CONFIG_SCHEMA_ROOT = "conduit-config/src/main/resources/json/";
+  private static final String CONFIG_SCHEMA_ROOT = "dataline-config/src/main/resources/json/";
 
   private final ObjectMapper objectMapper;
   private final SchemaValidatorsConfig schemaValidatorsConfig;
diff --git a/conduit-config-persistence/src/main/java/io/dataline/conduit/persistence/PersistenceConfigType.java b/dataline-config-persistence/src/main/java/io/dataline/config/persistence/PersistenceConfigType.java
similarity index 87%
rename from conduit-config-persistence/src/main/java/io/dataline/conduit/persistence/PersistenceConfigType.java
rename to dataline-config-persistence/src/main/java/io/dataline/config/persistence/PersistenceConfigType.java
index 51efae1050b44..16034f9f0e6d0 100644
--- a/conduit-config-persistence/src/main/java/io/dataline/conduit/persistence/PersistenceConfigType.java
+++ b/dataline-config-persistence/src/main/java/io/dataline/config/persistence/PersistenceConfigType.java
@@ -1,4 +1,4 @@
-package io.dataline.conduit.persistence;
+package io.dataline.config.persistence;
 
 public enum PersistenceConfigType {
   SOURCE_CONNECTION_CONFIGURATION,
diff --git a/conduit-config/build.gradle b/dataline-config/build.gradle
similarity index 89%
rename from conduit-config/build.gradle
rename to dataline-config/build.gradle
index 5b862bd98ff1a..083b0c762c451 100644
--- a/conduit-config/build.gradle
+++ b/dataline-config/build.gradle
@@ -1,4 +1,4 @@
-group 'io.dataline.conduit'
+group 'io.dataline'
 version '0.1.0'
 
 // todo: make sure we use the non-deprecated version of this.
@@ -31,5 +31,5 @@ dependencies {
 }
 
 jsonSchema2Pojo {
-    targetPackage = 'io.dataline.conduit.conduit_config'
+    targetPackage = 'io.dataline.config'
 }
diff --git a/conduit-config/src/main/java/io/dataline/conduit/conduit_config/ConfigSchema.java b/dataline-config/src/main/java/io/dataline/config/ConfigSchema.java
similarity index 94%
rename from conduit-config/src/main/java/io/dataline/conduit/conduit_config/ConfigSchema.java
rename to dataline-config/src/main/java/io/dataline/config/ConfigSchema.java
index 647167664bd4d..a786703bf7253 100644
--- a/conduit-config/src/main/java/io/dataline/conduit/conduit_config/ConfigSchema.java
+++ b/dataline-config/src/main/java/io/dataline/config/ConfigSchema.java
@@ -1,4 +1,4 @@
-package io.dataline.conduit.conduit_config;
+package io.dataline.config;
 
 public enum ConfigSchema {
   SOURCE_CONNECTION_CONFIGURATION("SourceConnectionConfiguration.json"),
diff --git a/conduit-config/src/main/resources/json/DestinationConnectionConfiguration.json b/dataline-config/src/main/resources/json/DestinationConnectionConfiguration.json
similarity index 100%
rename from conduit-config/src/main/resources/json/DestinationConnectionConfiguration.json
rename to dataline-config/src/main/resources/json/DestinationConnectionConfiguration.json
diff --git a/conduit-config/src/main/resources/json/SourceConnectionConfiguration.json b/dataline-config/src/main/resources/json/SourceConnectionConfiguration.json
similarity index 100%
rename from conduit-config/src/main/resources/json/SourceConnectionConfiguration.json
rename to dataline-config/src/main/resources/json/SourceConnectionConfiguration.json
diff --git a/conduit-config/src/main/resources/json/StandardConnectionStatus.json b/dataline-config/src/main/resources/json/StandardConnectionStatus.json
similarity index 100%
rename from conduit-config/src/main/resources/json/StandardConnectionStatus.json
rename to dataline-config/src/main/resources/json/StandardConnectionStatus.json
diff --git a/conduit-config/src/main/resources/json/StandardDataSchema.json b/dataline-config/src/main/resources/json/StandardDataSchema.json
similarity index 100%
rename from conduit-config/src/main/resources/json/StandardDataSchema.json
rename to dataline-config/src/main/resources/json/StandardDataSchema.json
diff --git a/conduit-config/src/main/resources/json/StandardDiscoveryOutput.json b/dataline-config/src/main/resources/json/StandardDiscoveryOutput.json
similarity index 100%
rename from conduit-config/src/main/resources/json/StandardDiscoveryOutput.json
rename to dataline-config/src/main/resources/json/StandardDiscoveryOutput.json
diff --git a/conduit-config/src/main/resources/json/StandardSyncConfiguration.json b/dataline-config/src/main/resources/json/StandardSyncConfiguration.json
similarity index 100%
rename from conduit-config/src/main/resources/json/StandardSyncConfiguration.json
rename to dataline-config/src/main/resources/json/StandardSyncConfiguration.json
diff --git a/conduit-config/src/main/resources/json/StandardSyncSchedule.json b/dataline-config/src/main/resources/json/StandardSyncSchedule.json
similarity index 100%
rename from conduit-config/src/main/resources/json/StandardSyncSchedule.json
rename to dataline-config/src/main/resources/json/StandardSyncSchedule.json
diff --git a/conduit-config/src/main/resources/json/StandardSyncSummary.json b/dataline-config/src/main/resources/json/StandardSyncSummary.json
similarity index 100%
rename from conduit-config/src/main/resources/json/StandardSyncSummary.json
rename to dataline-config/src/main/resources/json/StandardSyncSummary.json
diff --git a/conduit-config/src/main/resources/json/State.json b/dataline-config/src/main/resources/json/State.json
similarity index 100%
rename from conduit-config/src/main/resources/json/State.json
rename to dataline-config/src/main/resources/json/State.json
diff --git a/conduit-server/build.gradle b/dataline-server/build.gradle
similarity index 84%
rename from conduit-server/build.gradle
rename to dataline-server/build.gradle
index 333253aa847bd..fa7b5d2d0bc72 100644
--- a/conduit-server/build.gradle
+++ b/dataline-server/build.gradle
@@ -24,10 +24,11 @@ dependencies {
     compile(group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.9.8");
     compile(group: "com.networknt", name: "json-schema-validator", version: "1.0.42");
 
-    implementation project(':conduit-api')
-    implementation project(':conduit-config')
+    implementation project(':dataline-api')
+    implementation project(':dataline-commons')
+    implementation project(':dataline-config')
 }
 
 application {
-    mainClass = 'io.dataline.conduit.server.ServerApp'
+    mainClass = 'io.dataline.server.ServerApp'
 }
diff --git a/conduit-server/src/main/java/io/dataline/conduit/server/ServerApp.java b/dataline-server/src/main/java/io/dataline/server/ServerApp.java
similarity index 76%
rename from conduit-server/src/main/java/io/dataline/conduit/server/ServerApp.java
rename to dataline-server/src/main/java/io/dataline/server/ServerApp.java
index 8d80d9b6b7b1d..283c01e01fe38 100644
--- a/conduit-server/src/main/java/io/dataline/conduit/server/ServerApp.java
+++ b/dataline-server/src/main/java/io/dataline/server/ServerApp.java
@@ -1,6 +1,6 @@
-package io.dataline.conduit.server;
+package io.dataline.server;
 
-import io.dataline.conduit.server.apis.ConduitConfigurationApi;
+import io.dataline.server.apis.ConfigurationApi;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
@@ -17,11 +17,11 @@ public void start() throws Exception {
 
     ServletContextHandler handler = new ServletContextHandler();
 
-    ResourceConfig rc = new ResourceConfig().registerClasses(ConduitConfigurationApi.class);
+    ResourceConfig rc = new ResourceConfig().registerClasses(ConfigurationApi.class);
 
-    ServletHolder conduitServlet = new ServletHolder(new ServletContainer(rc));
+    ServletHolder configServlet = new ServletHolder(new ServletContainer(rc));
 
-    handler.addServlet(conduitServlet, "/api/v1/*");
+    handler.addServlet(configServlet, "/api/v1/*");
 
     server.setHandler(handler);
 
diff --git a/conduit-server/src/main/java/io/dataline/conduit/server/apis/ConduitConfigurationApi.java b/dataline-server/src/main/java/io/dataline/server/apis/ConfigurationApi.java
similarity index 95%
rename from conduit-server/src/main/java/io/dataline/conduit/server/apis/ConduitConfigurationApi.java
rename to dataline-server/src/main/java/io/dataline/server/apis/ConfigurationApi.java
index fef7594df4516..bcfaf1c9b2151 100644
--- a/conduit-server/src/main/java/io/dataline/conduit/server/apis/ConduitConfigurationApi.java
+++ b/dataline-server/src/main/java/io/dataline/server/apis/ConfigurationApi.java
@@ -1,11 +1,11 @@
-package io.dataline.conduit.server.apis;
+package io.dataline.server.apis;
 
-import io.dataline.conduit.api.model.*;
+import io.dataline.api.model.*;
 import javax.validation.Valid;
 import javax.ws.rs.Path;
 
 @Path("/v1")
-public class ConduitConfigurationApi implements io.dataline.conduit.api.V1Api {
+public class ConfigurationApi implements io.dataline.api.V1Api {
 
   @Override
   public ConnectionRead createConnection(@Valid ConnectionCreate connectionCreate) {
diff --git a/conduit-server/src/test/java/io/dataline/conduit/server/ServerAppTest.java b/dataline-server/src/test/java/io/dataline/server/ServerAppTest.java
similarity index 82%
rename from conduit-server/src/test/java/io/dataline/conduit/server/ServerAppTest.java
rename to dataline-server/src/test/java/io/dataline/server/ServerAppTest.java
index fdfa346915747..fff7a57aeaac8 100644
--- a/conduit-server/src/test/java/io/dataline/conduit/server/ServerAppTest.java
+++ b/dataline-server/src/test/java/io/dataline/server/ServerAppTest.java
@@ -1,4 +1,4 @@
-package io.dataline.conduit.server;
+package io.dataline.server;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/conduit-webapp/.gitignore b/dataline-webapp/.gitignore
similarity index 100%
rename from conduit-webapp/.gitignore
rename to dataline-webapp/.gitignore
diff --git a/conduit-webapp/README.md b/dataline-webapp/README.md
similarity index 100%
rename from conduit-webapp/README.md
rename to dataline-webapp/README.md
diff --git a/conduit-webapp/nginx.conf b/dataline-webapp/nginx.conf
similarity index 100%
rename from conduit-webapp/nginx.conf
rename to dataline-webapp/nginx.conf
diff --git a/conduit-webapp/package-lock.json b/dataline-webapp/package-lock.json
similarity index 98%
rename from conduit-webapp/package-lock.json
rename to dataline-webapp/package-lock.json
index c191beb0ad236..17f118190fa3b 100644
--- a/conduit-webapp/package-lock.json
+++ b/dataline-webapp/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "conduit-webapp",
+  "name": "dataline-webapp",
   "version": "0.1.0",
   "lockfileVersion": 1,
   "requires": true,
@@ -56,6 +56,11 @@
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
           "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
         }
       }
     },
@@ -67,6 +72,13 @@
         "@babel/types": "^7.11.0",
         "jsesc": "^2.5.1",
         "source-map": "^0.5.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        }
       }
     },
     "@babel/helper-annotate-as-pure": {
@@ -1296,13 +1308,6 @@
         "slash": "^2.0.0",
         "source-map": "^0.6.0",
         "string-length": "^2.0.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
       }
     },
     "@jest/source-map": {
@@ -1319,11 +1324,6 @@
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
           "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         }
       }
     },
@@ -1369,13 +1369,6 @@
         "slash": "^2.0.0",
         "source-map": "^0.6.1",
         "write-file-atomic": "2.4.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
       }
     },
     "@jest/types": {
@@ -1549,6 +1542,11 @@
             "@types/yargs-parser": "*"
           }
         },
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+        },
         "ansi-styles": {
           "version": "4.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -1558,15 +1556,6 @@
             "color-convert": "^2.0.1"
           }
         },
-        "aria-query": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
-          "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
-          "requires": {
-            "@babel/runtime": "^7.10.2",
-            "@babel/runtime-corejs3": "^7.10.2"
-          }
-        },
         "chalk": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
@@ -1813,6 +1802,11 @@
             "@types/yargs-parser": "*"
           }
         },
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+        },
         "ansi-styles": {
           "version": "4.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -2258,9 +2252,9 @@
       "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4="
     },
     "ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
     },
     "ansi-styles": {
       "version": "3.2.1",
@@ -2293,12 +2287,12 @@
       }
     },
     "aria-query": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz",
-      "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
+      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
       "requires": {
-        "ast-types-flow": "0.0.7",
-        "commander": "^2.11.0"
+        "@babel/runtime": "^7.10.2",
+        "@babel/runtime-corejs3": "^7.10.2"
       }
     },
     "arity-n": {
@@ -3512,13 +3506,6 @@
       "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
       "requires": {
         "source-map": "~0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
       }
     },
     "clean-stack": {
@@ -3964,13 +3951,6 @@
         "source-map": "^0.6.1",
         "source-map-resolve": "^0.5.2",
         "urix": "^0.1.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
       }
     },
     "css-blank-pseudo": {
@@ -4078,13 +4058,6 @@
       "requires": {
         "mdn-data": "2.0.4",
         "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
       }
     },
     "css-what": {
@@ -4199,11 +4172,6 @@
           "version": "2.0.6",
           "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz",
           "integrity": "sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA=="
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         }
       }
     },
@@ -4873,14 +4841,6 @@
         "esutils": "^2.0.2",
         "optionator": "^0.8.1",
         "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "optional": true
-        }
       }
     },
     "eslint": {
@@ -5234,6 +5194,15 @@
         "jsx-ast-utils": "^2.2.1"
       },
       "dependencies": {
+        "aria-query": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz",
+          "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=",
+          "requires": {
+            "ast-types-flow": "0.0.7",
+            "commander": "^2.11.0"
+          }
+        },
         "emoji-regex": {
           "version": "7.0.3",
           "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
@@ -6670,6 +6639,11 @@
         "through": "^2.3.6"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+        },
         "ansi-styles": {
           "version": "4.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -7081,13 +7055,6 @@
         "make-dir": "^2.1.0",
         "rimraf": "^2.6.3",
         "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
       }
     },
     "istanbul-reports": {
@@ -7533,11 +7500,6 @@
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
           "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         }
       }
     },
@@ -9232,11 +9194,6 @@
         "supports-color": "^6.1.0"
       },
       "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
         "supports-color": {
           "version": "6.1.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
@@ -10180,13 +10137,6 @@
         "ansi-regex": "^4.0.0",
         "ansi-styles": "^3.2.0",
         "react-is": "^16.8.4"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
-        }
       }
     },
     "process": {
@@ -10454,11 +10404,6 @@
             "@babel/highlight": "^7.8.3"
           }
         },
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
-        },
         "browserslist": {
           "version": "4.10.0",
           "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.10.0.tgz",
@@ -11054,11 +10999,6 @@
             "supports-color": "^6.1.0"
           }
         },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
         "supports-color": {
           "version": "6.1.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
@@ -11594,6 +11534,11 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
         }
       }
     },
@@ -11710,9 +11655,9 @@
       "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="
     },
     "source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
     },
     "source-map-resolve": {
       "version": "0.5.3",
@@ -11733,13 +11678,6 @@
       "requires": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
       }
     },
     "source-map-url": {
@@ -11999,6 +11937,11 @@
         "strip-ansi": "^6.0.0"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+        },
         "strip-ansi": {
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
@@ -12078,13 +12021,6 @@
       "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
       "requires": {
         "ansi-regex": "^4.1.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
-        }
       }
     },
     "strip-bom": {
@@ -12246,13 +12182,6 @@
         "commander": "^2.20.0",
         "source-map": "~0.6.1",
         "source-map-support": "~0.5.12"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
       }
     },
     "terser-webpack-plugin": {
@@ -12341,11 +12270,6 @@
             "find-up": "^4.0.0"
           }
         },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
         "supports-color": {
           "version": "7.1.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
@@ -13086,11 +13010,6 @@
             "randombytes": "^2.1.0"
           }
         },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
         "ssri": {
           "version": "6.0.1",
           "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
@@ -13473,13 +13392,6 @@
       "requires": {
         "source-list-map": "^2.0.0",
         "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
       }
     },
     "websocket-driver": {
diff --git a/conduit-webapp/package.json b/dataline-webapp/package.json
similarity index 96%
rename from conduit-webapp/package.json
rename to dataline-webapp/package.json
index 14ebd6018ca4c..e1ac01622ff9c 100644
--- a/conduit-webapp/package.json
+++ b/dataline-webapp/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "conduit-webapp",
+  "name": "dataline-webapp",
   "version": "0.1.0",
   "private": true,
   "dependencies": {
diff --git a/conduit-webapp/public/favicon.ico b/dataline-webapp/public/favicon.ico
similarity index 100%
rename from conduit-webapp/public/favicon.ico
rename to dataline-webapp/public/favicon.ico
diff --git a/conduit-webapp/public/index.html b/dataline-webapp/public/index.html
similarity index 100%
rename from conduit-webapp/public/index.html
rename to dataline-webapp/public/index.html
diff --git a/conduit-webapp/public/logo192.png b/dataline-webapp/public/logo192.png
similarity index 100%
rename from conduit-webapp/public/logo192.png
rename to dataline-webapp/public/logo192.png
diff --git a/conduit-webapp/public/logo512.png b/dataline-webapp/public/logo512.png
similarity index 100%
rename from conduit-webapp/public/logo512.png
rename to dataline-webapp/public/logo512.png
diff --git a/conduit-webapp/public/manifest.json b/dataline-webapp/public/manifest.json
similarity index 100%
rename from conduit-webapp/public/manifest.json
rename to dataline-webapp/public/manifest.json
diff --git a/conduit-webapp/public/robots.txt b/dataline-webapp/public/robots.txt
similarity index 100%
rename from conduit-webapp/public/robots.txt
rename to dataline-webapp/public/robots.txt
diff --git a/conduit-webapp/src/App.css b/dataline-webapp/src/App.css
similarity index 100%
rename from conduit-webapp/src/App.css
rename to dataline-webapp/src/App.css
diff --git a/conduit-webapp/src/App.js b/dataline-webapp/src/App.js
similarity index 100%
rename from conduit-webapp/src/App.js
rename to dataline-webapp/src/App.js
diff --git a/conduit-webapp/src/App.test.js b/dataline-webapp/src/App.test.js
similarity index 100%
rename from conduit-webapp/src/App.test.js
rename to dataline-webapp/src/App.test.js
diff --git a/conduit-webapp/src/index.css b/dataline-webapp/src/index.css
similarity index 100%
rename from conduit-webapp/src/index.css
rename to dataline-webapp/src/index.css
diff --git a/conduit-webapp/src/index.js b/dataline-webapp/src/index.js
similarity index 100%
rename from conduit-webapp/src/index.js
rename to dataline-webapp/src/index.js
diff --git a/conduit-webapp/src/logo.svg b/dataline-webapp/src/logo.svg
similarity index 100%
rename from conduit-webapp/src/logo.svg
rename to dataline-webapp/src/logo.svg
diff --git a/conduit-webapp/src/serviceWorker.js b/dataline-webapp/src/serviceWorker.js
similarity index 100%
rename from conduit-webapp/src/serviceWorker.js
rename to dataline-webapp/src/serviceWorker.js
diff --git a/conduit-webapp/src/setupTests.js b/dataline-webapp/src/setupTests.js
similarity index 100%
rename from conduit-webapp/src/setupTests.js
rename to dataline-webapp/src/setupTests.js
diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml
index 6d0250f65a0ac..ae2ab8e861286 100644
--- a/docker-compose.dev.yaml
+++ b/docker-compose.dev.yaml
@@ -6,7 +6,7 @@ services:
       context: .
       dockerfile: server.Dockerfile
     image: server:dev
-    container_name: conduit-server
+    container_name: dataline-server
     ports:
       - 8001:8000
   webapp:
@@ -14,7 +14,7 @@ services:
       context: .
       dockerfile: webapp.Dockerfile
     image: webapp:dev
-    container_name: conduit-webapp
+    container_name: dataline-webapp
     ports:
       - 8000:80
     depends_on:
diff --git a/docker-compose.dist.yaml b/docker-compose.dist.yaml
index b183d54ee0c14..44d42427c23d4 100644
--- a/docker-compose.dist.yaml
+++ b/docker-compose.dist.yaml
@@ -2,6 +2,6 @@ version: '3'
 
 services:
   server:
-    image: dataline/conduit-server:${VERSION}
+    image: dataline/dataline-server:${VERSION}
   webapp:
-    image: dataline/conduit-webapp:${VERSION}
+    image: dataline/dataline-webapp:${VERSION}
diff --git a/server.Dockerfile b/server.Dockerfile
index 8dd49016d7d55..036c7cb7deb61 100644
--- a/server.Dockerfile
+++ b/server.Dockerfile
@@ -6,9 +6,9 @@ WORKDIR /code
 # for i in **/*.gradle; do echo COPY ./$i $(dirname $i)/; done
 COPY ./.env ./
 COPY ./build.gradle ./
-COPY ./conduit-api/build.gradle conduit-api/
-COPY ./conduit-commons/build.gradle conduit-commons/
-COPY ./conduit-server/build.gradle conduit-server/
+COPY ./dataline-api/build.gradle dataline-api/
+COPY ./dataline-commons/build.gradle dataline-commons/
+COPY ./dataline-server/build.gradle dataline-server/
 COPY ./settings.gradle ./
 
 RUN gradle --gradle-user-home=/tmp/gradle_cache clean dependencies --no-daemon
@@ -21,16 +21,16 @@ WORKDIR /code
 COPY --from=cache /tmp/gradle_cache /home/gradle/.gradle
 COPY . /code
 RUN gradle clean distTar --no-daemon
-RUN ls /code/conduit-server/build/distributions/
+RUN ls /code/dataline-server/build/distributions/
 
 # Build final image
 FROM openjdk:14.0.2-slim
 
 EXPOSE 8000
 
-WORKDIR /app/conduit-server
+WORKDIR /app/dataline-server
 
-COPY --from=build /code/conduit-server/build/distributions/*.tar conduit-server.tar
-RUN tar xf conduit-server.tar --strip-components=1
+COPY --from=build /code/dataline-server/build/distributions/*.tar dataline-server.tar
+RUN tar xf dataline-server.tar --strip-components=1
 
-CMD bin/conduit-server
+CMD bin/dataline-server
diff --git a/settings.gradle b/settings.gradle
index b831ecc8d354b..b70d7d2bd3e73 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,7 +1,7 @@
-rootProject.name = 'conduit'
+rootProject.name = 'dataline'
 
-include 'conduit-api'
-include 'conduit-commons'
-include 'conduit-config'
-include 'conduit-config-persistence'
-include 'conduit-server'
+include 'dataline-api'
+include 'dataline-commons'
+include 'dataline-config'
+include 'dataline-config-persistence'
+include 'dataline-server'
diff --git a/tools/app/build.sh b/tools/app/build.sh
deleted file mode 100755
index 268fda45737e8..0000000000000
--- a/tools/app/build.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env sh
-
-set -e
-
-. tools/lib/lib.sh
-
-main() {
-  assert_root
-
-  docker build . -t dataline/conduit:$VERSION
-}
-
-main "$@"
diff --git a/tools/app/publish.sh b/tools/app/publish.sh
deleted file mode 100755
index 6fdf48046f298..0000000000000
--- a/tools/app/publish.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env sh
-
-set -e
-
-. tools/lib/lib.sh
-
-main() {
-  assert_root
-
-  docker push dataline/conduit:$VERSION
-}
-
-main "$@"
diff --git a/tools/lib/lib.sh b/tools/lib/lib.sh
index d429b4a470421..fcc3db2925311 100644
--- a/tools/lib/lib.sh
+++ b/tools/lib/lib.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-VERSION=$(cat .version)
+VERSION=$(cat .env | grep "^VERSION=" | cut -d = -f 2)
 
 error() {
   echo "$@"
diff --git a/webapp.Dockerfile b/webapp.Dockerfile
index 4740ed6c77bd0..88d72e501fe30 100644
--- a/webapp.Dockerfile
+++ b/webapp.Dockerfile
@@ -3,7 +3,7 @@ FROM node:14.7-alpine AS cache
 
 WORKDIR /code
 
-COPY conduit-webapp/package.json conduit-webapp/package-lock.json ./
+COPY dataline-webapp dataline-webapp/package-lock.json ./
 RUN npm install
 
 # Build webapp
@@ -12,7 +12,7 @@ FROM node:14.7-alpine AS build
 WORKDIR /code
 
 COPY --from=cache /code/node_modules /code/node_modules
-COPY conduit-webapp /code
+COPY dataline-webapp /code
 RUN npm run-script build
 
 # Build final image