diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ef249f77f..bc5e550793 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,7 +51,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - `no-multi-spaces` rule (horizontal alignment of comments is no longer allowed) ([#269](https://github.com/shyiko/ktlint/issues/269)).
 - `colon-spacing` rule (`:` must not appear at the beginning of the line).
 - `package-name` rule (disabled until [#208](https://github.com/shyiko/ktlint/issues/208) is resolved).
-- `--print-ast` to output [com.github.shyiko.ktlint.core.ast.ElementType.*](https://github.com/shyiko/ktlint/blob/master/ktlint-core/src/main/kotlin/com/github/shyiko/ktlint/core/ast/ElementType.kt) as `node.elementType`, e.g. 
+- `--print-ast` to output [com.pinterest.ktlint.core.ast.ElementType.*](https://github.com/shyiko/ktlint/blob/master/ktlint-core/src/main/kotlin/com/github/shyiko/ktlint/core/ast/ElementType.kt) as `node.elementType`, e.g. 
 ```
 $ echo 'fun f() {}' | ./ktlint/target/ktlint --print-ast --color --stdin
 1: ~.psi.KtFile (FILE)
diff --git a/ktlint-core/src/main/kotlin/com/pinterest/ktlint/core/ReporterProvider.kt b/ktlint-core/src/main/kotlin/com/pinterest/ktlint/core/ReporterProvider.kt
index a2e3075a33..6022f6b027 100644
--- a/ktlint-core/src/main/kotlin/com/pinterest/ktlint/core/ReporterProvider.kt
+++ b/ktlint-core/src/main/kotlin/com/pinterest/ktlint/core/ReporterProvider.kt
@@ -5,7 +5,7 @@ import java.io.PrintStream
 /**
  * `ktlint` uses [ServiceLoader](http://docs.oracle.com/javase/6/docs/api/java/util/ServiceLoader.html) to
  * discover all available [ReporterProvider]s on the classpath and so each [ReporterProvider] must be registered using
- * `META-INF/services/com.github.shyiko.ktlint.core.ReporterProvider`
+ * `META-INF/services/com.pinterest.ktlint.core.ReporterProvider`
  * (see `ktlint-reporter-plain/src/main/resources` for an example).
  */
 interface ReporterProvider {
diff --git a/ktlint-core/src/main/kotlin/com/pinterest/ktlint/core/RuleSetProvider.kt b/ktlint-core/src/main/kotlin/com/pinterest/ktlint/core/RuleSetProvider.kt
index 8d8f235d5b..47fcd33191 100644
--- a/ktlint-core/src/main/kotlin/com/pinterest/ktlint/core/RuleSetProvider.kt
+++ b/ktlint-core/src/main/kotlin/com/pinterest/ktlint/core/RuleSetProvider.kt
@@ -3,7 +3,7 @@ package com.pinterest.ktlint.core
 /**
  * `ktlint` uses [ServiceLoader](http://docs.oracle.com/javase/6/docs/api/java/util/ServiceLoader.html) to
  * discover all available `RuleSetProvider`s on the classpath and so each `RuleSetProvider` must be registered using
- * `META-INF/services/com.github.shyiko.ktlint.core.RuleSetProvider`
+ * `META-INF/services/com.pinterest.ktlint.core.RuleSetProvider`
  * (see `ktlint-ruleset-standard/src/main/resources` for an example).
  */
 interface RuleSetProvider {
diff --git a/ktlint-ruleset-template/build.gradle b/ktlint-ruleset-template/build.gradle
index 24225e6861..84ad1abdeb 100644
--- a/ktlint-ruleset-template/build.gradle
+++ b/ktlint-ruleset-template/build.gradle
@@ -63,7 +63,7 @@ dependencies {
 }
 
 task ktlint(type: JavaExec, dependsOn: classes) {
-    main = 'com.github.shyiko.ktlint.Main'
+    main = 'com.pinterest.ktlint.Main'
     // adding compiled classes to the classpath so that ktlint would validate project's sources
     // using its own ruleset (in other words to dogfood)
     classpath = configurations.ktlint + sourceSets.main.output
diff --git a/ktlint-ruleset-template/src/test/kotlin/yourpkgname/NoVarRuleTest.kt b/ktlint-ruleset-template/src/test/kotlin/yourpkgname/NoVarRuleTest.kt
index a4086d01c9..7413450e64 100644
--- a/ktlint-ruleset-template/src/test/kotlin/yourpkgname/NoVarRuleTest.kt
+++ b/ktlint-ruleset-template/src/test/kotlin/yourpkgname/NoVarRuleTest.kt
@@ -12,7 +12,7 @@ class NoVarRuleTest : Spek({
     describe("no-var rule") {
 
         // whenever KTLINT_DEBUG env variable is set to "ast" or -DktlintDebug=ast is used
-        // com.github.shyiko.ktlint.test.(lint|format) will print AST (along with other debug info) to the stderr.
+        // com.pinterest.ktlint.test.(lint|format) will print AST (along with other debug info) to the stderr.
         // this can be extremely helpful while writing and testing rules.
         // uncomment the line below to take a quick look at it
         // System.setProperty("ktlintDebug", "ast")
diff --git a/ktlint/build.gradle b/ktlint/build.gradle
index 9c495e741a..9c27164924 100644
--- a/ktlint/build.gradle
+++ b/ktlint/build.gradle
@@ -1,17 +1,10 @@
 plugins {
   id 'org.jetbrains.kotlin.jvm'
   id 'application'
-  // applied after mainClassName per https://github.com/johnrengelman/shadow/issues/336
-  id 'com.github.johnrengelman.shadow' version '4.0.2' apply false
 }
 
-apply plugin: 'com.github.johnrengelman.shadow'
-
-shadowJar {
-  mainClassName = 'com.github.shyiko.ktlint.Main'
-  mergeServiceFiles {
-    include 'META-INF/services/com.github.shyiko.ktlint.core.*'
-  }
+application {
+  mainClassName = 'com.pinterest.ktlint.Main'
 }
 
 dependencies {