diff --git a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt
index f47452ba..709096f6 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt
@@ -19,13 +19,13 @@ import java.io.File
 import java.nio.file.Path
 import java.nio.file.Paths
 
-class AndroidConfiguration(var compileSdkVersion : String = "23",
+class AndroidConfig(var compileSdkVersion : String = "23",
        var buildToolsVersion : String = "23.0.1",
        var applicationId: String? = null)
 
 @Directive
-fun Project.android(init: AndroidConfiguration.() -> Unit) : AndroidConfiguration {
-    val pd = AndroidConfiguration()
+fun Project.android(init: AndroidConfig.() -> Unit) : AndroidConfig {
+    val pd = AndroidConfig()
     pd.init()
     (Kobalt.findPlugin("android") as AndroidPlugin).setConfiguration(this, pd)
     return pd
@@ -47,10 +47,10 @@ public class AndroidPlugin @Inject constructor(val javaCompiler: JavaCompiler) :
         context.classpathContributors.add(this)
     }
 
-    val configurations = hashMapOf<String, AndroidConfiguration>()
+    val configurations = hashMapOf<String, AndroidConfig>()
 
-    fun setConfiguration(p: Project, configuration: AndroidConfiguration) {
-        configurations.put(p.name!!, configuration)
+    fun setConfiguration(p: Project, config: AndroidConfig) {
+        configurations.put(p.name!!, config)
     }
 
     override fun accept(project: Project) = configurations.containsKey(project.name!!)
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/publish/JCenterApi.kt b/src/main/kotlin/com/beust/kobalt/plugin/publish/JCenterApi.kt
index 0ad0b554..e9f22044 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/publish/JCenterApi.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/publish/JCenterApi.kt
@@ -71,7 +71,7 @@ public class JCenterApi @Inject constructor (@Nullable @Assisted("username") val
 //        return http.post(username, password, url, jsonString)
 //    }
 
-    fun uploadMaven(project: Project, files: List<File>, configuration : JCenterConfiguration?) : TaskResult {
+    fun uploadMaven(project: Project, files: List<File>, config: JCenterConfig?) : TaskResult {
         if (! packageExists(project.name!!)) {
             throw KobaltException("Couldn't find a package called ${project.name} on bintray, please create one first" +
                     " as explained at https://bintray.com/docs/usermanual/uploads/uploads_creatinganewpackage.html")
@@ -91,16 +91,16 @@ public class JCenterApi @Inject constructor (@Nullable @Assisted("username") val
                     .joinToString("/")
         }
 
-        return upload(files, configuration, fileToPath, generateMd5 = true, generateAsc = true)
+        return upload(files, config, fileToPath, generateMd5 = true, generateAsc = true)
     }
 
-    fun uploadFile(file: File, url: String, configuration: JCenterConfiguration, generateMd5: Boolean = false,
+    fun uploadFile(file: File, url: String, config: JCenterConfig, generateMd5: Boolean = false,
             generateAsc: Boolean = false) =
-        upload(arrayListOf(file), configuration, {
+        upload(arrayListOf(file), config, {
                 f: File -> "${UnauthenticatedJCenterApi.BINTRAY_URL_API_CONTENT}/$username/generic/$url"},
                 generateMd5, generateAsc)
 
-    private fun upload(files: List<File>, configuration : JCenterConfiguration?, fileToPath: (File) -> String,
+    private fun upload(files: List<File>, config: JCenterConfig?, fileToPath: (File) -> String,
             generateMd5: Boolean = false, generateAsc: Boolean) : TaskResult {
         val filesToUpload = arrayListOf<File>()
 
@@ -125,7 +125,7 @@ public class JCenterApi @Inject constructor (@Nullable @Assisted("username") val
         // If any configuration was given, apply them so the URL reflects them, e.g. ?publish=1
         //
         val options = arrayListOf<String>()
-        if (configuration?.publish == true) options.add("publish=1")
+        if (config?.publish == true) options.add("publish=1")
 
         val optionPath = StringBuffer()
         if (options.size > 0) {
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt
index 6086bca4..f060a651 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt
@@ -81,7 +81,7 @@ public class PublishPlugin @Inject constructor(val files: KFiles, val factory: P
         //
         // Upload individual files, if applicable
         //
-        configuration?.let { conf : JCenterConfiguration ->
+        configuration?.let { conf : JCenterConfig ->
             conf.files.forEach {
                 val taskResult = jcenter.uploadFile(File(project.directory, it.first), it.second /* url */, conf)
                 success = success and taskResult.success
@@ -96,14 +96,14 @@ public class PublishPlugin @Inject constructor(val files: KFiles, val factory: P
     /**
      * Map of project name -> JCenterConfiguration
      */
-    private val configurations = hashMapOf<String, JCenterConfiguration>()
-    fun addConfiguration(projectName: String, config: JCenterConfiguration) {
+    private val configurations = hashMapOf<String, JCenterConfig>()
+    fun addConfiguration(projectName: String, config: JCenterConfig) {
         configurations.put(projectName, config)
     }
 
 }
 
-data class JCenterConfiguration(val project: Project) {
+data class JCenterConfig(val project: Project) {
     var publish: Boolean = false
     val files = arrayListOf<Pair<String, String>>()
 
@@ -114,8 +114,8 @@ data class JCenterConfiguration(val project: Project) {
 }
 
 @Directive
-public fun Project.jcenter(ini: JCenterConfiguration.() -> Unit) : JCenterConfiguration {
-    val pd = JCenterConfiguration(this)
+public fun Project.jcenter(ini: JCenterConfig.() -> Unit) : JCenterConfig {
+    val pd = JCenterConfig(this)
     pd.ini()
     (Kobalt.findPlugin("publish") as PublishPlugin).addConfiguration(name!!, pd)
     return pd