diff --git a/pub/CHANGELOG b/pub/CHANGELOG
index 9d3c8452490c2d7fe416a0a42b84f88ce1813c54..a8438d18eb5a830a5411d6f27cf46796bfd81b72 100644
--- a/pub/CHANGELOG
+++ b/pub/CHANGELOG
@@ -1,5 +1,7 @@
 Release 2.1.4c of
 
+- user interface changes:
+  - 'resol' instead of 'dirac'
 - improved behavior:
   - improve curve refinement, especially for log axes (close_enough)
 - bugfixes:
diff --git a/pub/src/expr.cpp b/pub/src/expr.cpp
index 845adc70224c68526eed856bf81962422620f7aa..b0fc388bee56a7b15fb1c6f1b4dfa508184434d4 100644
--- a/pub/src/expr.cpp
+++ b/pub/src/expr.cpp
@@ -574,7 +574,7 @@ void CTree::set_coord( CCoord& ret, uint k ) const
         arg[0]->set_coord( ret, k );
         break;
     case _DIRAC:
-        ret = CCoord("dirac", "");
+        ret = CCoord("resol", "");
         break;
     case _VAL:
         ret = CCoord(strg(val), "");
@@ -608,7 +608,7 @@ string CTree::tree_info() const
     case _CONV:
         return "conv(" + arg[0]->tree_info() + ")";
     case _DIRAC:
-        return "dirac(" + arg[0]->tree_info() + ")";
+        return "resol(" + arg[0]->tree_info() + ")";
     case _VAL:
         return "val[" + strg(val) + "]";
     case _REF:
diff --git a/pub/src/xax_lex.lpp b/pub/src/xax_lex.lpp
index 3cdbef975b5e49c7ca0c35b86f119f458010e111..6512d4b183447288aa4600752ea29c306f90f947 100644
--- a/pub/src/xax_lex.lpp
+++ b/pub/src/xax_lex.lpp
@@ -96,7 +96,7 @@ e {
 "over" { return BOP_OVER; } /* binomial coefficient: n over k */
 
 "conv" { return CONV; }
-"dirac" { return DIRAC; }
+"resol" { return DIRAC; }
 
 {ID}	{
         // printf( "lex: An identifier: %s\n", xaxtext );