diff --git a/tool/src/org/antlr/v4/codegen/OutputModelController.java b/tool/src/org/antlr/v4/codegen/OutputModelController.java
index 8a38b666a..cba38bba8 100644
--- a/tool/src/org/antlr/v4/codegen/OutputModelController.java
+++ b/tool/src/org/antlr/v4/codegen/OutputModelController.java
@@ -400,7 +400,7 @@ public class OutputModelController {
 	public List<SrcOp> wildcard(GrammarAST ast, GrammarAST labelAST) {
 		List<SrcOp> ops = delegate.wildcard(ast, labelAST);
 		for (CodeGeneratorExtension ext : extensions) {
-			ops = ext.set(ops);
+			ops = ext.wildcard(ops);
 		}
 		return ops;
 	}
diff --git a/tool/src/org/antlr/v4/codegen/ParserFactory.java b/tool/src/org/antlr/v4/codegen/ParserFactory.java
index 4086886a4..79c796983 100644
--- a/tool/src/org/antlr/v4/codegen/ParserFactory.java
+++ b/tool/src/org/antlr/v4/codegen/ParserFactory.java
@@ -33,6 +33,7 @@ import org.antlr.v4.codegen.model.SemPred;
 import org.antlr.v4.codegen.model.SrcOp;
 import org.antlr.v4.codegen.model.StarBlock;
 import org.antlr.v4.codegen.model.TestSetInline;
+import org.antlr.v4.codegen.model.Wildcard;
 import org.antlr.v4.codegen.model.decl.Decl;
 import org.antlr.v4.codegen.model.decl.RuleContextDecl;
 import org.antlr.v4.codegen.model.decl.TokenDecl;
diff --git a/tool/src/org/antlr/v4/codegen/Wildcard.java b/tool/src/org/antlr/v4/codegen/model/Wildcard.java
similarity index 81%
rename from tool/src/org/antlr/v4/codegen/Wildcard.java
rename to tool/src/org/antlr/v4/codegen/model/Wildcard.java
index 6537cc7f1..7f2aefcba 100644
--- a/tool/src/org/antlr/v4/codegen/Wildcard.java
+++ b/tool/src/org/antlr/v4/codegen/model/Wildcard.java
@@ -4,9 +4,9 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v4.codegen;
+package org.antlr.v4.codegen.model;
 
-import org.antlr.v4.codegen.model.MatchToken;
+import org.antlr.v4.codegen.OutputModelFactory;
 import org.antlr.v4.tool.ast.GrammarAST;
 
 public class Wildcard extends MatchToken {