diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 0dbc0e0..d75075a 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -10,6 +10,8 @@
       <module name="samples-java_test" target="1.8" />
       <module name="samples-koltin_main" target="1.8" />
       <module name="samples-koltin_test" target="1.8" />
+      <module name="samples-kotlin_main" target="1.8" />
+      <module name="samples-kotlin_test" target="1.8" />
     </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index e86bd42..de97625 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -9,10 +9,10 @@
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/samples-java.iml" filepath="$PROJECT_DIR$/.idea/modules/samples-java.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/samples-java_main.iml" filepath="$PROJECT_DIR$/.idea/modules/samples-java_main.iml" group="samples-java" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/samples-java_test.iml" filepath="$PROJECT_DIR$/.idea/modules/samples-java_test.iml" group="samples-java" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/samples-koltin.iml" filepath="$PROJECT_DIR$/.idea/modules/samples-koltin.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/samples-koltin_main.iml" filepath="$PROJECT_DIR$/.idea/modules/samples-koltin_main.iml" group="samples-koltin" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/samples-koltin_test.iml" filepath="$PROJECT_DIR$/.idea/modules/samples-koltin_test.iml" group="samples-koltin" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/samples-kotlin.iml" filepath="$PROJECT_DIR$/.idea/modules/samples-kotlin.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/samples-kotlin_main.iml" filepath="$PROJECT_DIR$/.idea/modules/samples-kotlin_main.iml" group="samples-kotlin" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/samples-kotlin_test.iml" filepath="$PROJECT_DIR$/.idea/modules/samples-kotlin_test.iml" group="samples-kotlin" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/samples-kotlin~1.iml" filepath="$PROJECT_DIR$/.idea/modules/samples-kotlin~1.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/samples-koltin.iml b/.idea/modules/samples-koltin.iml
deleted file mode 100644
index 19a4623..0000000
--- a/.idea/modules/samples-koltin.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="samples-koltin" external.linked.project.path="$MODULE_DIR$/../../samples/koltin" external.root.project.path="$MODULE_DIR$/../../samples/koltin" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../samples/koltin">
-      <excludeFolder url="file://$MODULE_DIR$/../../samples/koltin/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/../../samples/koltin/build" />
-      <excludeFolder url="file://$MODULE_DIR$/../../samples/koltin/out" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/samples-koltin_main.iml b/.idea/modules/samples-kotlin_main.iml
similarity index 80%
rename from .idea/modules/samples-koltin_main.iml
rename to .idea/modules/samples-kotlin_main.iml
index bdcf78b..ce31ed3 100644
--- a/.idea/modules/samples-koltin_main.iml
+++ b/.idea/modules/samples-kotlin_main.iml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="samples-koltin:main" external.linked.project.path="$MODULE_DIR$/../../samples/koltin" external.root.project.path="$MODULE_DIR$/../../samples/koltin" external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="samples-kotlin:main" external.linked.project.path="$MODULE_DIR$/../../samples/kotlin" external.root.project.path="$MODULE_DIR$/../../samples/kotlin" external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
         <compilerSettings />
         <compilerArguments>
-          <option name="destination" value="$MODULE_DIR$/../../samples/koltin/build/classes/kotlin/main" />
+          <option name="destination" value="$MODULE_DIR$/../../samples/kotlin/build/classes/kotlin/main" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
-          <option name="moduleName" value="samples-koltin" />
+          <option name="moduleName" value="samples-kotlin" />
           <option name="addCompilerBuiltIns" value="true" />
           <option name="loadBuiltInsFromDependencies" value="true" />
           <option name="languageVersion" value="1.2" />
@@ -24,10 +24,10 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/../../samples/koltin/out/production/classes" />
+    <output url="file://$MODULE_DIR$/../../samples/kotlin/out/production/classes" />
     <exclude-output />
-    <content url="file://$MODULE_DIR$/../../samples/koltin/src/main">
-      <sourceFolder url="file://$MODULE_DIR$/../../samples/koltin/src/main/kotlin" isTestSource="false" />
+    <content url="file://$MODULE_DIR$/../../samples/kotlin/src/main">
+      <sourceFolder url="file://$MODULE_DIR$/../../samples/kotlin/src/main/kotlin" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/.idea/modules/samples-koltin_test.iml b/.idea/modules/samples-kotlin_test.iml
similarity index 79%
rename from .idea/modules/samples-koltin_test.iml
rename to .idea/modules/samples-kotlin_test.iml
index 3886186..6308f4c 100644
--- a/.idea/modules/samples-koltin_test.iml
+++ b/.idea/modules/samples-kotlin_test.iml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="samples-koltin:test" external.linked.project.path="$MODULE_DIR$/../../samples/koltin" external.root.project.path="$MODULE_DIR$/../../samples/koltin" external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="samples-kotlin:test" external.linked.project.path="$MODULE_DIR$/../../samples/kotlin" external.root.project.path="$MODULE_DIR$/../../samples/kotlin" external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
         <compilerSettings />
         <compilerArguments>
-          <option name="destination" value="$MODULE_DIR$/../../samples/koltin/build/classes/kotlin/test" />
+          <option name="destination" value="$MODULE_DIR$/../../samples/kotlin/build/classes/kotlin/test" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
-          <option name="moduleName" value="samples-koltin" />
+          <option name="moduleName" value="samples-kotlin" />
           <option name="addCompilerBuiltIns" value="true" />
           <option name="loadBuiltInsFromDependencies" value="true" />
           <option name="languageVersion" value="1.2" />
@@ -24,12 +24,12 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output-test url="file://$MODULE_DIR$/../../samples/koltin/out/test/classes" />
+    <output-test url="file://$MODULE_DIR$/../../samples/kotlin/out/test/classes" />
     <exclude-output />
-    <content url="file://$MODULE_DIR$/../../samples/koltin/src/test" />
+    <content url="file://$MODULE_DIR$/../../samples/kotlin/src/test" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="samples-koltin_main" />
+    <orderEntry type="module" module-name="samples-kotlin_main" />
     <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.0" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.2.50" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.10.0" level="project" />
@@ -37,5 +37,5 @@
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.14.0" level="project" />
   </component>
-  <component name="TestModuleProperties" production-module="samples-koltin_main" />
+  <component name="TestModuleProperties" production-module="samples-kotlin_main" />
 </module>
\ No newline at end of file
diff --git a/.idea/modules/samples-kotlin~1.iml b/.idea/modules/samples-kotlin~1.iml
new file mode 100644
index 0000000..16c524b
--- /dev/null
+++ b/.idea/modules/samples-kotlin~1.iml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="samples-kotlin" external.linked.project.path="$MODULE_DIR$/../../samples/kotlin" external.root.project.path="$MODULE_DIR$/../../samples/kotlin" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../samples/kotlin">
+      <excludeFolder url="file://$MODULE_DIR$/../../samples/kotlin/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/../../samples/kotlin/build" />
+      <excludeFolder url="file://$MODULE_DIR$/../../samples/kotlin/out" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/README.md b/README.md
index d32566c..f8a6b70 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ poster.addPin("http://www.example.com/foo", "This is a test")
 poster.deletePin("http:///www.example.com/bar")
 
 ```
-[View Example](https://github.com/ethauvin/pinboard-poster/blob/master/samples/koltin/src/main/kotlin/net/thauvin/erik/pinboard/samples/KotlinExample.kt)
+[View Example](https://github.com/ethauvin/pinboard-poster/blob/master/samples/kotlin/src/main/kotlin/net/thauvin/erik/pinboard/samples/KotlinExample.kt)
 
 ### Java
 ```java
@@ -55,7 +55,7 @@ dependencies {
 }
 ```
 [View Example](https://github.com/ethauvin/pinboard-poster/blob/master/samples/java/build.gradle)  
-[View Kotlin DSL Example](https://github.com/ethauvin/pinboard-poster/blob/master/samples/koltin/build.gradle.kts)
+[View Kotlin DSL Example](https://github.com/ethauvin/pinboard-poster/blob/master/samples/kotlin/build.gradle.kts)
 
 ### Kobalt
 
@@ -66,7 +66,7 @@ dependencies {
     compile("net.thauvin.erik:pinboard-poster:1.0.0")
 }
 ```
-[View Example](https://github.com/ethauvin/pinboard-poster/blob/master/samples/koltin/kobalt/src/Build.kt)
+[View Example](https://github.com/ethauvin/pinboard-poster/blob/master/samples/kotlin/kobalt/src/Build.kt)
 
 ## Adding
 
diff --git a/samples/koltin/settings.gradle b/samples/koltin/settings.gradle
deleted file mode 100644
index b5aa465..0000000
--- a/samples/koltin/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = 'samples-koltin'
diff --git a/samples/koltin/.gitignore b/samples/kotlin/.gitignore
similarity index 100%
rename from samples/koltin/.gitignore
rename to samples/kotlin/.gitignore
diff --git a/samples/koltin/build.gradle.kts b/samples/kotlin/build.gradle.kts
similarity index 100%
rename from samples/koltin/build.gradle.kts
rename to samples/kotlin/build.gradle.kts
diff --git a/samples/koltin/gradle/wrapper/gradle-wrapper.jar b/samples/kotlin/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from samples/koltin/gradle/wrapper/gradle-wrapper.jar
rename to samples/kotlin/gradle/wrapper/gradle-wrapper.jar
diff --git a/samples/koltin/gradle/wrapper/gradle-wrapper.properties b/samples/kotlin/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from samples/koltin/gradle/wrapper/gradle-wrapper.properties
rename to samples/kotlin/gradle/wrapper/gradle-wrapper.properties
diff --git a/samples/koltin/gradlew b/samples/kotlin/gradlew
similarity index 100%
rename from samples/koltin/gradlew
rename to samples/kotlin/gradlew
diff --git a/samples/koltin/gradlew.bat b/samples/kotlin/gradlew.bat
similarity index 100%
rename from samples/koltin/gradlew.bat
rename to samples/kotlin/gradlew.bat
diff --git a/samples/koltin/kobalt/src/Build.kt b/samples/kotlin/kobalt/src/Build.kt
similarity index 100%
rename from samples/koltin/kobalt/src/Build.kt
rename to samples/kotlin/kobalt/src/Build.kt
diff --git a/samples/koltin/kobalt/wrapper/kobalt-wrapper.jar b/samples/kotlin/kobalt/wrapper/kobalt-wrapper.jar
similarity index 100%
rename from samples/koltin/kobalt/wrapper/kobalt-wrapper.jar
rename to samples/kotlin/kobalt/wrapper/kobalt-wrapper.jar
diff --git a/samples/koltin/kobalt/wrapper/kobalt-wrapper.properties b/samples/kotlin/kobalt/wrapper/kobalt-wrapper.properties
similarity index 100%
rename from samples/koltin/kobalt/wrapper/kobalt-wrapper.properties
rename to samples/kotlin/kobalt/wrapper/kobalt-wrapper.properties
diff --git a/samples/koltin/kobaltw b/samples/kotlin/kobaltw
similarity index 100%
rename from samples/koltin/kobaltw
rename to samples/kotlin/kobaltw
diff --git a/samples/koltin/kobaltw.bat b/samples/kotlin/kobaltw.bat
similarity index 100%
rename from samples/koltin/kobaltw.bat
rename to samples/kotlin/kobaltw.bat
diff --git a/samples/kotlin/settings.gradle.kts b/samples/kotlin/settings.gradle.kts
new file mode 100644
index 0000000..28613c7
--- /dev/null
+++ b/samples/kotlin/settings.gradle.kts
@@ -0,0 +1 @@
+rootProject.name = "samples-kotlin"
diff --git a/samples/koltin/src/main/kotlin/net/thauvin/erik/pinboard/samples/KotlinExample.kt b/samples/kotlin/src/main/kotlin/net/thauvin/erik/pinboard/samples/KotlinExample.kt
similarity index 100%
rename from samples/koltin/src/main/kotlin/net/thauvin/erik/pinboard/samples/KotlinExample.kt
rename to samples/kotlin/src/main/kotlin/net/thauvin/erik/pinboard/samples/KotlinExample.kt