diff --git a/build.gradle b/build.gradle
index f7fadf7910..988f52d81b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'org.github.ngbinh.scalastyle:gradle-scalastyle-plugin_2.11:0.9.0'
+        classpath 'org.github.ngbinh.scalastyle:gradle-scalastyle-plugin_2.11:1.0.1'
     }
 }
 
@@ -49,8 +49,8 @@ configure(allProjs) {
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
 
-    // Max: Set this to the main class for cli.
-    // Could not figure out how to configure it just for the cli subproject
+    // Set this to the main class for cli.
+    // Could not figure out how to configure it just for the cli subproject.
     mainClassName = "com.salesforce.op.cli.CLI"
 
     ext {
diff --git a/cli/build.gradle b/cli/build.gradle
index f367f5ae1c..baad839a59 100644
--- a/cli/build.gradle
+++ b/cli/build.gradle
@@ -1,5 +1,3 @@
-apply plugin: 'com.github.johnrengelman.shadow'
-
 dependencies {
     // scopt
     compile "com.github.scopt:scopt_$scalaVersion:$scoptVersion"
@@ -25,13 +23,6 @@ ext {
     templateResourcesDir = "$project.buildDir/template-resources"
 }
 
-shadowJar {
-    zip64 = true
-    exclude 'META-INF/maven/**'
-    baseName = jar.baseName
-}
-shadowJar.dependsOn(createVersionProperties)
-
 task copySpark(type: Copy) {
     from '../templates/simple/gradle'
     into "$templateResourcesDir/templates/simple/gradle"
@@ -42,13 +33,11 @@ task copySpark(type: Copy) {
 }
 
 task copyTools(type: Copy) {
-
     from '../templates/simple'
     into "$templateResourcesDir/templates/simple"
     include "**/gradlew"
     include "**/spark.gradle"
     exclude "**/*.gradle.template"
-
 }
 
 task copyLocalTemplates(type: Copy) {
@@ -58,7 +47,6 @@ task copyLocalTemplates(type: Copy) {
 }
 
 task copyTemplates(type: Copy) {
-
     from '../templates'
     into "$templateResourcesDir/templates"
     exclude '**/*.jar'
diff --git a/cli/src/main/scala/com/salesforce/op/cli/CommandParser.scala b/cli/src/main/scala/com/salesforce/op/cli/CommandParser.scala
index 3dc8ee5946..6b134817af 100644
--- a/cli/src/main/scala/com/salesforce/op/cli/CommandParser.scala
+++ b/cli/src/main/scala/com/salesforce/op/cli/CommandParser.scala
@@ -62,10 +62,10 @@ trait OpCli {
   }
 }
 
-object CommandParser extends scopt.OptionParser[CliParameters]("op") with OpCli {
+object CommandParser extends scopt.OptionParser[CliParameters]("transmogrifai") with OpCli {
   private[cli] var AUTO_ENABLED = true // for testing, temporary
 
-  head("op: TransmogrifAI CLI")
+  head("transmogrifai: TransmogrifAI CLI")
 
   help("help")
 
diff --git a/helloworld/build.gradle b/helloworld/build.gradle
index 974e51ddf5..96dcca549f 100644
--- a/helloworld/build.gradle
+++ b/helloworld/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'org.github.ngbinh.scalastyle:gradle-scalastyle-plugin_2.11:0.9.0'
+        classpath 'org.github.ngbinh.scalastyle:gradle-scalastyle-plugin_2.11:1.0.1'
     }
 }
 plugins {