diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbf8a994a0..ea95a9426a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,15 @@ _Note: Gaps between patch versions are faulty, broken or test releases._
 
 See [CHANGELOG - 6to5](CHANGELOG-6to5.md) for the pre-4.0.0 version changelog.
 
+## 6.0.18
+
+ * **Polish**
+  * Add error when calling builder methods with too many arguments than it can take.
+  * Rename `RegexLiteral` node to `RegExpLiteral`.
+  * Rename `NumberLiteral` node to `NumericLiteral`.
+ * **Bug Fix**
+  * Make all fields of a `ForStatement` optional.
+
 ## 6.0.17
 
  * **Polish**
@@ -78,7 +87,7 @@ See [CHANGELOG - 6to5](CHANGELOG-6to5.md) for the pre-4.0.0 version changelog.
   * The `MethodDefinition` node type has been renamed to `ClassMethod` and it's `FunctionExpression` `value` property has been coerced into the main method node.
   * The `Property` node type has been renamed to `ObjectProperty`.
   * The `Property` node type with the boolean flag `method` has been renamed to `ObjectMethod` and it's `FunctionExpression` `value` property has been coerced into the main method node.
-  * The `Literal` node type has been unoverloaded and split into `BooleanLiteral`, `RegexLiteral`, `NumberLiteral`, `StringLiteral` and `NullLiteral`.
+  * The `Literal` node type has been unoverloaded and split into `BooleanLiteral`, `RegExpLiteral`, `NumericLiteral`, `StringLiteral` and `NullLiteral`.
   * The `SpreadProperty` (from `object-rest-spread`) node type has been split into `RestProperty` (for `ObjectPattern`) and `SpreadProperty` (for `ObjectExpression`)
   * Remove `module.exports` export interop for CommonJS module formatter.
   * `externalHelpers` option has been moved into the plugin `babel-plugin-external-helper-2`.
diff --git a/doc/ast/spec.md b/doc/ast/spec.md
index 7b5ab54b52..1c3b44171f 100644
--- a/doc/ast/spec.md
+++ b/doc/ast/spec.md
@@ -9,7 +9,7 @@ This document specifies the core ESTree AST node types that support the ES5 gram
   - [NullLiteral](#nullliteral)
   - [StringLiteral](#stringliteral)
   - [BooleanLiteral](#booleanliteral)
-  - [NumberLiteral](#numberliteral)
+  - [NumericLiteral](#NumericLiteral)
 - [Programs](#programs)
 - [Functions](#functions)
 - [Statements](#statements)
@@ -153,11 +153,11 @@ An identifier. Note that an identifier may be an expression or a destructuring p
 
 # Literals
 
-## RegexpLiteral
+## RegExpLiteral
 
 ```js
 interface RegExpLiteral <: Literal {
-  type: "RegexLiteral";
+  type: "RegExpLiteral";
   pattern: string;
   flags: string;
 }
@@ -189,11 +189,11 @@ interface BooleanLiteral <: Literal {
 }
 ```
 
-## NumberLiteral
+## NumericLiteral
 
 ```js
-interface NumberLiteral <: Literal {
-  type: "NumberLiteral";
+interface NumericLiteral <: Literal {
+  type: "NumericLiteral";
   value: number;
 }
 ```