diff --git a/gunit/resources/org/antlr/v4/gunit/jUnit.stg b/gunit/resources/org/antlr/v4/gunit/jUnit.stg
index abb4a524e..9aeb8d874 100644
--- a/gunit/resources/org/antlr/v4/gunit/jUnit.stg
+++ b/gunit/resources/org/antlr/v4/gunit/jUnit.stg
@@ -9,7 +9,7 @@ import org.junit.Test;
 import org.junit.Before;
 import static org.junit.Assert.*;
 
-public class <className> extends org.antlr.v4.gunit.jUnitBaseTest {	
+public class <className> extends org.antlr.v4.gunit.gUnitBase {
 	@Before public void setup() {
 	    lexerClassName = "<options.lexer>";
 	    parserClassName = "<options.parser>";
diff --git a/gunit/src/org/antlr/v4/gunit/jUnitBaseTest.java b/gunit/src/org/antlr/v4/gunit/gUnitBase.java
similarity index 98%
rename from gunit/src/org/antlr/v4/gunit/jUnitBaseTest.java
rename to gunit/src/org/antlr/v4/gunit/gUnitBase.java
index 158a2337b..8d92509d3 100644
--- a/gunit/src/org/antlr/v4/gunit/jUnitBaseTest.java
+++ b/gunit/src/org/antlr/v4/gunit/gUnitBase.java
@@ -6,7 +6,7 @@ import org.antlr.runtime.tree.TreeAdaptor;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 
-public class jUnitBaseTest {
+public class gUnitBase {
     public String lexerClassName;
     public String parserClassName;
     public String adaptorClassName;
diff --git a/tool/test/org/antlr/v4/test/TestASTStructure.java b/tool/test/org/antlr/v4/test/TestASTStructure.java
index 039f2c06d..430feb6a0 100644
--- a/tool/test/org/antlr/v4/test/TestASTStructure.java
+++ b/tool/test/org/antlr/v4/test/TestASTStructure.java
@@ -2,11 +2,12 @@ package org.antlr.v4.test;
 
 import org.antlr.runtime.*;
 import org.antlr.runtime.tree.*;
+import org.antlr.v4.gunit.gUnitBase;
 import org.junit.Test;
 import org.junit.Before;
 import static org.junit.Assert.*;
 
-public class TestASTStructure extends org.antlr.v4.gunit.jUnitBaseTest {	
+public class TestASTStructure extends gUnitBase {
 	@Before public void setup() {
 	    lexerClassName = "org.antlr.v4.parse.ANTLRLexer";
 	    parserClassName = "org.antlr.v4.parse.ANTLRParser";
@@ -423,5 +424,5 @@ public class TestASTStructure extends org.antlr.v4.gunit.jUnitBaseTest {
 		Object actual = ((Tree)rstruct.getTree()).toStringTree();
 		Object expecting = "(= x (^ A))";
 		assertEquals("testing rule element", expecting, actual);
-	} 
-}
\ No newline at end of file
+	}
+}