diff --git a/Solidity.g4 b/Solidity.g4
index 0c86e10..1f7999c 100644
--- a/Solidity.g4
+++ b/Solidity.g4
@@ -251,7 +251,7 @@ primaryExpression
   | identifier ('[' ']')?
   | TypeKeyword
   | tupleExpression
-  | elementaryTypeNameExpression ('[' ']')? ;
+  | typeNameExpression ('[' ']')? ;
 
 expressionList
   : expression (',' expression)* ;
@@ -346,8 +346,9 @@ tupleExpression
   : '(' ( expression? ( ',' expression? )* ) ')'
   | '[' ( expression ( ',' expression )* )? ']' ;
 
-elementaryTypeNameExpression
-  : elementaryTypeName ;
+typeNameExpression
+  : elementaryTypeName
+  | userDefinedTypeName ;
 
 numberLiteral
   : (DecimalNumber | HexNumber) NumberUnit? ;