diff --git a/build.sbt b/build.sbt
index 61163e50846..dd4aac920c2 100644
--- a/build.sbt
+++ b/build.sbt
@@ -32,7 +32,7 @@ def javacOptionsVersion(scalaVersion: String): Seq[String] = {
 
 lazy val commonSettings = Seq (
   organization := "edu.berkeley.cs",
-  version := "3.0.0-RC2",
+  version := "3.0.0",
   git.remoteRepo := "git@github.com:freechipsproject/chisel3.git",
   autoAPIMappings := true,
   scalaVersion := "2.11.11",
@@ -92,7 +92,7 @@ lazy val publishSettings = Seq (
   }
 )
 
-val defaultVersions = Map("firrtl" -> "1.0.0-RC2")
+val defaultVersions = Map("firrtl" -> "1.0.0")
 
 lazy val chiselSettings = Seq (
   name := "chisel3",
diff --git a/src/main/scala/chisel3/Driver.scala b/src/main/scala/chisel3/Driver.scala
index d138bf1fea6..dae921ab0ac 100644
--- a/src/main/scala/chisel3/Driver.scala
+++ b/src/main/scala/chisel3/Driver.scala
@@ -23,8 +23,8 @@ import _root_.firrtl.annotations.AnnotationYamlProtocol._
   * @example
   *          {{{
   *          val optionsManager = new ExecutionOptionsManager("chisel3")
-  *              with FirrtlExecutionOptions
-  *              with ChiselExecutionOptions {
+  *              with HasFirrtlOptions
+  *              with HasChiselExecutionOptions {
   *            commonOptions = CommonOption(targetDirName = "my_target_dir")
   *            chiselOptions = ChiselExecutionOptions(runFirrtlCompiler = false)
   *          }