diff --git a/front-end/servlet/pom.xml b/front-end/servlet/pom.xml
index 0f08ae611..3661e113e 100644
--- a/front-end/servlet/pom.xml
+++ b/front-end/servlet/pom.xml
@@ -59,7 +59,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>apicurio-studio-fe-app</artifactId>
+            <artifactId>apicurio-studio-fe-studio</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
diff --git a/front-end/studio/.editorconfig b/front-end/studio/.editorconfig
deleted file mode 100644
index 6e87a003d..000000000
--- a/front-end/studio/.editorconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-# Editor configuration, see http://editorconfig.org
-root = true
-
-[*]
-charset = utf-8
-indent_style = space
-indent_size = 2
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.md]
-max_line_length = off
-trim_trailing_whitespace = false
diff --git a/front-end/studio/.gitignore b/front-end/studio/.gitignore
index 3d01bd247..46223375c 100644
--- a/front-end/studio/.gitignore
+++ b/front-end/studio/.gitignore
@@ -1,7 +1,8 @@
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 
-deploy-prod.sh
-serve.sh
+/deploy-prod.sh
+/serve.sh
+/node
 
 # compiled output
 /dist
diff --git a/front-end/studio/pom.xml b/front-end/studio/pom.xml
index fc8a9b33f..f67a93dfe 100644
--- a/front-end/studio/pom.xml
+++ b/front-end/studio/pom.xml
@@ -42,11 +42,11 @@
                     <execution>
                         <id>ng build</id>
                         <goals>
-                            <goal>npm</goal>
+                            <goal>yarn</goal>
                         </goals>
                         <phase>generate-resources</phase>
                         <configuration>
-                            <arguments>run-script build</arguments>
+                            <arguments>build</arguments>
                         </configuration>
                     </execution>
                 </executions>
@@ -67,6 +67,12 @@
                                 <resource>
                                     <directory>${basedir}/dist</directory>
                                     <filtering>false</filtering>
+                                    <excludes>
+                                        <exclude>config.js</exclude>
+                                        <exclude>keycloak.js</exclude>
+                                        <exclude>keycloak.json</exclude>
+                                        <exclude>version.js</exclude>
+                                    </excludes>
                                 </resource>
                             </resources>
                         </configuration>
diff --git a/front-end/studio/src/app/components/nav-header.component.html b/front-end/studio/src/app/components/nav-header.component.html
index 7590bb75a..9d45e9b27 100644
--- a/front-end/studio/src/app/components/nav-header.component.html
+++ b/front-end/studio/src/app/components/nav-header.component.html
@@ -40,6 +40,10 @@ <h1 class="about-title">Apicurio Studio</h1>
                             <td><strong>Built On</strong></td>
                             <td>{{ builtOn | date }}</td>
                         </tr>
+                        <tr>
+                            <td><strong>Edition</strong></td>
+                            <td>CLI</td>
+                        </tr>
                         <tr>
                             <td><strong>Project URL</strong></td>
                             <td><a href="{{ projectUrl }}" target="_blank">{{ projectUrl }} <span class="fa fa-external-link"></span></a></td>
@@ -54,4 +58,4 @@ <h1 class="about-title">Apicurio Studio</h1>
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/platforms/swarm/ui/pom.xml b/platforms/swarm/ui/pom.xml
index bb43475aa..cc1c5f935 100644
--- a/platforms/swarm/ui/pom.xml
+++ b/platforms/swarm/ui/pom.xml
@@ -27,7 +27,7 @@
         <!-- Static Angular Files -->
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>apicurio-studio-fe-app</artifactId>
+            <artifactId>apicurio-studio-fe-studio</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
@@ -64,13 +64,13 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>${project.groupId}</groupId>
-                                    <artifactId>apicurio-studio-fe-app</artifactId>
+                                    <artifactId>apicurio-studio-fe-studio</artifactId>
                                     <version>${project.version}</version>
                                     <type>jar</type>
                                     <overWrite>true</overWrite>
                                 </artifactItem>
                             </artifactItems>
-                            <outputDirectory>${project.build.directory}/fe-app</outputDirectory>
+                            <outputDirectory>${project.build.directory}/fe-studio</outputDirectory>
                             <overWriteReleases>false</overWriteReleases>
                             <overWriteSnapshots>true</overWriteSnapshots>
                         </configuration>
@@ -83,7 +83,7 @@
                 <configuration>
                     <webResources>
                         <resource>
-                            <directory>target/fe-app</directory>
+                            <directory>target/fe-studio</directory>
                         </resource>
                         <resource>
                             <directory>src/main/filtered-resources</directory>
diff --git a/platforms/wildfly/ui/pom.xml b/platforms/wildfly/ui/pom.xml
index 455ba0dea..ba199db85 100644
--- a/platforms/wildfly/ui/pom.xml
+++ b/platforms/wildfly/ui/pom.xml
@@ -25,7 +25,7 @@
 
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>apicurio-studio-fe-app</artifactId>
+            <artifactId>apicurio-studio-fe-studio</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
@@ -48,13 +48,13 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>${project.groupId}</groupId>
-                                    <artifactId>apicurio-studio-fe-app</artifactId>
+                                    <artifactId>apicurio-studio-fe-studio</artifactId>
                                     <version>${project.version}</version>
                                     <type>jar</type>
                                     <overWrite>true</overWrite>
                                 </artifactItem>
                             </artifactItems>
-                            <outputDirectory>${project.build.directory}/fe-app</outputDirectory>
+                            <outputDirectory>${project.build.directory}/fe-studio</outputDirectory>
                             <overWriteReleases>false</overWriteReleases>
                             <overWriteSnapshots>true</overWriteSnapshots>
                         </configuration>
@@ -67,7 +67,7 @@
                 <configuration>
                     <webResources>
                         <resource>
-                            <directory>target/fe-app</directory>
+                            <directory>target/fe-studio</directory>
                         </resource>
                         <resource>
                             <directory>src/main/filtered-resources</directory>