10 files changed, 13 insertions, 13 deletions
diff --git a/build/build.scala b/build/build.scala
index 6c55e11..b4a39ea 100644
--- a/build/build.scala
+++ b/build/build.scala
@@ -16,7 +16,7 @@ class Build(val context: Context) extends Publish{
   def groupId: String = "org.cvogt"
 
   def version: String = "0.9"
-  def name: String = "cbt"
+  override def name: String = "cbt"
 
   // Members declared in cbt.Publish
   def description: String = "Fast, intuitive Build Tool for Scala"
diff --git a/examples/build-info-example/build/build.scala b/examples/build-info-example/build/build.scala
index 4d28598..b5ea86b 100644
--- a/examples/build-info-example/build/build.scala
+++ b/examples/build-info-example/build/build.scala
@@ -2,7 +2,7 @@ import cbt._
 import java.nio.file.Files._
 
 class Build(val context: Context) extends PackageJars{
-  def name = "build-info-example"
+  override def name = "build-info-example"
   def groupId = "cbt.examples"
   override def defaultScalaVersion = "2.11.8"
   def version = "0.1"
diff --git a/examples/scalajs-plain-example/js/build/build.scala b/examples/scalajs-plain-example/js/build/build.scala
index 06e4876..4c251cd 100644
--- a/examples/scalajs-plain-example/js/build/build.scala
+++ b/examples/scalajs-plain-example/js/build/build.scala
@@ -1,6 +1,6 @@
 import cbt._
 class Build(val context: Context) extends ScalaJsBuild{
-  override def projectName = "my-project"
+  override def name = "my-project"
 
   override def sources = super.sources ++ Seq(
     projectDirectory.getParentFile ++ "/shared"
@@ -14,5 +14,5 @@ class Build(val context: Context) extends ScalaJsBuild{
   )
 
   override def scalaJsTargetFile =
-    projectDirectory.getParentFile ++ ("/server/public/generated/" ++ projectName ++ ".js")
+    projectDirectory.getParentFile ++ ("/server/public/generated/" ++ name ++ ".js")
 }
diff --git a/examples/scalajs-react-example/js/build/build.scala b/examples/scalajs-react-example/js/build/build.scala
index 6db866b..d8e8c16 100644
--- a/examples/scalajs-react-example/js/build/build.scala
+++ b/examples/scalajs-react-example/js/build/build.scala
@@ -1,6 +1,6 @@
 import cbt._
 class Build(val context: Context) extends ScalaJsBuild{
-  override def projectName = "my-project"
+  override def name = "my-project"
 
   override def sources = super.sources ++ Seq(
     projectDirectory.getParentFile ++ "/shared"
@@ -17,5 +17,5 @@ class Build(val context: Context) extends ScalaJsBuild{
   )
 
   override def scalaJsTargetFile =
-    projectDirectory.getParentFile ++ ("/server/public/generated/" ++ projectName ++ ".js")
+    projectDirectory.getParentFile ++ ("/server/public/generated/" ++ name ++ ".js")
 }
diff --git a/examples/uber-jar-example/README.md b/examples/uber-jar-example/README.md
index 2460084..e4f8da0 100644
--- a/examples/uber-jar-example/README.md
+++ b/examples/uber-jar-example/README.md
@@ -4,7 +4,7 @@ This example shows how to build uber jar(aka fat jar) with `UberJar` plugin.
 
 In order to create uber jar: execute `cbt uberJar`. Produced jar will be in target folder.
 
-By default, jar name is your `cbt projectName`, you can provide other name via overriding `uberJarName` task.
+By default, jar name is your `cbt name`, you can provide other name via overriding `uberJarName` task.
 
 By default, main class is `Main`. You can provide custom main class via overriding `uberJarMainClass` task.
 
diff --git a/examples/uber-jar-example/build/build.scala b/examples/uber-jar-example/build/build.scala
index fec58ae..181098f 100644
--- a/examples/uber-jar-example/build/build.scala
+++ b/examples/uber-jar-example/build/build.scala
@@ -2,7 +2,7 @@ import cbt._
 
 class Build(val context: Context) extends BaseBuild with UberJar {
 
-  override def projectName: String = "uber-jar-example"
+  override def name: String = "uber-jar-example"
 
   override def dependencies = super.dependencies ++
     Resolver( mavenCentral ).bind(
@@ -11,6 +11,6 @@ class Build(val context: Context) extends BaseBuild with UberJar {
       ScalaDependency("org.typelevel", "cats", "0.6.0")
     )
 
-  override def uberJarName = projectName + "-0.0.1" + ".jar"
+  override def uberJarName = name + "-0.0.1" + ".jar"
 
 }
diff --git a/plugins/uber-jar/src/UberJar.scala b/plugins/uber-jar/src/UberJar.scala
index 3783367..79b87a1 100644
--- a/plugins/uber-jar/src/UberJar.scala
+++ b/plugins/uber-jar/src/UberJar.scala
@@ -15,7 +15,7 @@ trait UberJar extends BaseBuild {
 
   def uberJarMainClass: Option[String] = runClass
 
-  def uberJarName: String = projectName + ".jar"
+  def uberJarName: String = name + ".jar"
 
 }
 
diff --git a/stage2/BasicBuild.scala b/stage2/BasicBuild.scala
index 88f08dc..f7f54a3 100644
--- a/stage2/BasicBuild.scala
+++ b/stage2/BasicBuild.scala
@@ -41,7 +41,7 @@ trait BaseBuild extends BuildInterface with DependencyImplementation with Trigge
   def defaultScalaVersion: String = constants.scalaVersion
   final def scalaVersion = context.scalaVersion getOrElse defaultScalaVersion
   final def scalaMajorVersion: String = lib.libMajorVersion(scalaVersion)
-  def projectName = "default"
+  def name = projectDirectory.getName
 
   // TODO: get rid of this in favor of newBuild.
   // currently blocked on DynamicOverride being not parts
diff --git a/tools/gui/resources/template-project/build/build.scala b/tools/gui/resources/template-project/build/build.scala
index 3ec5db9..b632d97 100644
--- a/tools/gui/resources/template-project/build/build.scala
+++ b/tools/gui/resources/template-project/build/build.scala
@@ -2,4 +2,4 @@ import cbt._
 
 class Build(val context: Context) extends BaseBuild##with## {
 
-##projectName####dependencies##}
+##name####dependencies##}
diff --git a/tools/gui/src/ProjectBuilder.scala b/tools/gui/src/ProjectBuilder.scala
index ceba376..4204942 100644
--- a/tools/gui/src/ProjectBuilder.scala
+++ b/tools/gui/src/ProjectBuilder.scala
@@ -95,7 +95,7 @@ class ProjectBuilder(
     writeTemplate(
       templateDir / "build" / "build.scala",
       buildDir / "build.scala",
-      (name, s"""  override def projectName = "$name"$blankLine""", "##projectName##"),
+      (name, s"""  override def name = "$name"$blankLine""", "##name##"),
       (dependencyString, dependencies + blankLine, "##dependencies##"),
       (plugins, plugins, "##with##")
     )