diff --git a/pmd-plsql/etc/grammar/PLSQL.jjt b/pmd-plsql/etc/grammar/PLSQL.jjt
index 5108997fac..f914e51d17 100644
--- a/pmd-plsql/etc/grammar/PLSQL.jjt
+++ b/pmd-plsql/etc/grammar/PLSQL.jjt
@@ -5239,7 +5239,7 @@ TOKEN :
 	( "\""  <LETTER> ( <LETTER> | <DIGIT> | "$" | "_" | "#" )* "\"" )
 >
 |
-< LEXICAL_PARAMETER:
+< #LEXICAL_PARAMETER:
   (
     ("&&" | "&")
     (
@@ -5263,12 +5263,6 @@ TOKEN :
 |
 < QUOTED_LITERAL: "\"" (<_WHATEVER_CHARACTER_WO_QUOTE> | <SPECIAL_CHARACTERS> | "\\\"")* "\"" >
 |
-< SQLDATA_CLASS: "SQLData" >
-|
-< CUSTOMDATUM_CLASS: "CustomDatum" >
-|
-< ORADATA_CLASS:  "OraData"  >
-|
 < JAVA_INTERFACE_CLASS: ( "SQLData" | "CustomDatum" | "OraData" ) >
 //|
 //< #BOOLEAN_LITERAL: "TRUE" | "FALSE" >
@@ -6677,7 +6671,7 @@ ASTID ID(): {}
 	        //20120427 | <OID>
 		//20120428 | <AGGREGATE>
 		//| <SYS_REFCURSOR>
-		| <JAVA_INTERFACE_CLASS> | <SQLDATA_CLASS> | <CUSTOMDATUM_CLASS> | <ORADATA_CLASS>
+		| <JAVA_INTERFACE_CLASS>
 		//20120427 | <EXTERNAL>
                 //SRT 20090608 ALTER TYPE key words
 		//| <ADD>
@@ -6967,7 +6961,7 @@ ASTTypeKeyword TypeKeyword(): {}
 	<TIMEZONE_REGION> | <TIMEZONE_ABBR> | <TIMEZONE_MINUTE> | <TIMEZONE_HOUR> |	 <DOUBLE> | <PRECISION> |
 	<VARRAY> |
 	<YEAR> | <LOCAL> | <WITH> | <ZONE>
-	| <JAVA_INTERFACE_CLASS> | <SQLDATA_CLASS> | <CUSTOMDATUM_CLASS> | <ORADATA_CLASS>
+	| <JAVA_INTERFACE_CLASS>
         )
 	{ jjtThis.setImage(token.getImage()) ; jjtThis.value = token ; return jjtThis ; }
 }
@@ -6975,7 +6969,7 @@ ASTTypeKeyword TypeKeyword(): {}
 ASTJavaInterfaceClass JavaInterfaceClass(): {}
 {
 	(
-          <SQLDATA_CLASS> | <CUSTOMDATUM_CLASS> | <ORADATA_CLASS>
+          <JAVA_INTERFACE_CLASS>
         )
 	{ jjtThis.setImage(token.getImage()) ; jjtThis.value = token ; return jjtThis ; }
 }