diff --git a/core/modules/parsers/wikiparser/rules/commentblock.js b/core/modules/parsers/wikiparser/rules/commentblock.js
index 1e9b2c622..a1510b8bc 100644
--- a/core/modules/parsers/wikiparser/rules/commentblock.js
+++ b/core/modules/parsers/wikiparser/rules/commentblock.js
@@ -55,8 +55,7 @@ exports.parse = function() {
 	var commentEnd = this.endMatch.index + this.endMatch[0].length;
 	var commentText = this.parser.source.slice(commentStart, commentEnd);
 	return [{
-			type: "comment",
-			void: true,
+			type: "void",
 			text: commentText,
 			start: commentStart,
 			end: commentEnd
diff --git a/core/modules/parsers/wikiparser/rules/commentinline.js b/core/modules/parsers/wikiparser/rules/commentinline.js
index 01f76c1c6..183eea447 100644
--- a/core/modules/parsers/wikiparser/rules/commentinline.js
+++ b/core/modules/parsers/wikiparser/rules/commentinline.js
@@ -48,8 +48,7 @@ exports.parse = function() {
 	var commentEnd = this.endMatch.index + this.endMatch[0].length;
 	var commentText = this.parser.source.slice(commentStart, commentEnd);
 	return [{
-			type: "comment",
-			void: true,
+			type: "void",
 			text: commentText,
 			start: commentStart,
 			end: commentEnd
diff --git a/core/modules/parsers/wikiparser/rules/parsermode.js b/core/modules/parsers/wikiparser/rules/parsermode.js
index 9aea958d2..ba165a283 100644
--- a/core/modules/parsers/wikiparser/rules/parsermode.js
+++ b/core/modules/parsers/wikiparser/rules/parsermode.js
@@ -63,8 +63,7 @@ exports.parse = function() {
 		}
 	}
 	return [{
-		type: "parsermode",
-		void: true,
+		type: "void",
 		parseAsInline: this.parser.parseAsInline,
 		start: start,
 		end: this.parser.pos