diff --git a/ChangeLog b/ChangeLog
index 3b7bd0ec77bd58210f5868bd9c2437c4b9cc7138..eeefc3258ef5374fa975799bb165c359f28df0a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-10-24  Jesper Öqvist <jesper.oqvist@cs.lth.se>
+
+    * Changed default name of the AST state class from ASTNode$State to
+    ASTState. This can be changed by the --stateClassName=NAME option.
+
 2016-05-29  Jesper Öqvist <joqvist@google.com>
 
     * Inherited equations on parameterized NTAs can no longer use the child
diff --git a/src/jastadd/ast/JaddCodeGen.jrag b/src/jastadd/ast/JaddCodeGen.jrag
index 00f431c8945d031e1bddf86c2032937a15429c87..d12335ada23d9f19816542e052a2966b99ecc253 100644
--- a/src/jastadd/ast/JaddCodeGen.jrag
+++ b/src/jastadd/ast/JaddCodeGen.jrag
@@ -248,7 +248,7 @@ aspect JaddCodeGen {
   }
 
   public void Grammar.genReset(PrintWriter out) {
-    templateContext().expand("ASTNode$State.reset", out);
+    templateContext().expand("ASTState.reset", out);
   }
 
   /**
@@ -257,7 +257,7 @@ aspect JaddCodeGen {
    * @param out Aspect output stream
    */
   public void Grammar.emitStateClass(PrintWriter out) {
-    templateContext().expand("ASTNode$State", out);
+    templateContext().expand("ASTState", out);
   }
 
   /**
diff --git a/src/java/org/jastadd/Configuration.java b/src/java/org/jastadd/Configuration.java
index 28021029de29720126990544073e807b38b8daad..ef2a433cd0aae1536675bfbf4d4e7a7f86e97f1c 100644
--- a/src/java/org/jastadd/Configuration.java
+++ b/src/java/org/jastadd/Configuration.java
@@ -103,7 +103,7 @@ public class Configuration {
   Option<String> stateClassNameOption = new ValueOption("stateClassName",
       "set the name of the AST state class")
       .acceptAnyValue()
-      .defaultValue("ASTNode$State")
+      .defaultValue("ASTState")
       .templateVariable("StateClass");
 
   Option<String> ASTNodeSuperOption = new ValueOption("ASTNodeSuper", "set the ASTNode supertype")
diff --git a/src/template/ast/State.tt b/src/template/ast/State.tt
index 31b6963bb3722bc9621ee34690c4f067b2856c2d..0b07c4c4c0c975ecd70dcb61db736f23f8ef711c 100644
--- a/src/template/ast/State.tt
+++ b/src/template/ast/State.tt
@@ -25,7 +25,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-ASTNode$State = [[
+ASTState = [[
 /** @apilevel internal */
 public class $StateClass {
   /** @apilevel internal */
@@ -255,7 +255,7 @@ $endif
 }
 ]]
 
-ASTNode$State.reset [[
+ASTState.reset [[
   /** @apilevel internal */
   public void $StateClass.reset() {
     $SynchBegin