diff --git a/pub/lib/xax_lex.lpp b/pub/lib/xax_lex.lpp
index 1209c658125155dc078079df3641bf039cfb408e..9083f2fb633d95ffa6a1631b1552bc9c18e006d4 100644
--- a/pub/lib/xax_lex.lpp
+++ b/pub/lib/xax_lex.lpp
@@ -170,11 +170,11 @@ e {
 <<EOF>> { return END; }
 %%
 
-int xaxparse( PNode* );
+int xaxparse( RNode* );
 
 std::shared_ptr<const class CNode> user_xaxparse( const char *lin )
 {
-        PNode T;
+        RNode T;
 	int err;
 	xax_scan_string(lin);
 	err=xaxparse( &T );
diff --git a/pub/lib/xax_yacc.ypp b/pub/lib/xax_yacc.ypp
index c69a822584b1fb3fbc65c3731da72bdd2da70387..3ff9e3259078e8760b80203ded5df04efbc40b05 100644
--- a/pub/lib/xax_yacc.ypp
+++ b/pub/lib/xax_yacc.ypp
@@ -23,7 +23,7 @@
 #include "coord.hpp"
 #include "node.hpp"
 
-int xaxerror( PNode* T, const char *s )
+int xaxerror( RNode* T, const char *s )
 {
     throw( string( "invalid expression: " ) + s );
     return 1;
@@ -40,7 +40,7 @@ struct xaxtype {
 #define YYSTYPE xaxtype
 
 #define YYERROR_VERBOSE 1
-int xaxerror( PNode* T, const char*);
+int xaxerror( RNode* T, const char*);
 int xaxlex(YYSTYPE *xaxlval); // created by lex.l
 
 #define MONFUNC(op,v1)       \
@@ -51,7 +51,7 @@ int xaxlex(YYSTYPE *xaxlval); // created by lex.l
   RNode( new CNodeFun3(GFuncRegistry->find_or_fail(op),v1.t,v2.t,v3.t) )
 %}
 
-%parse-param{ PNode* T }
+%parse-param{ RNode* T }
 %pure-parser
 %debug