Index: libcfa/src/stdhdr/bfdlink.h
===================================================================
--- libcfa/src/stdhdr/bfdlink.h	(revision e53e5aa2893d54433622774e08e241eddc7a7c75)
+++ libcfa/src/stdhdr/bfdlink.h	(revision 095ac9927ab4898752d1b2c90bc12487bfb282c1)
@@ -10,11 +10,11 @@
 // Created On       : Tue Jul 18 07:26:04 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Feb  1 07:15:29 2020
-// Update Count     : 5
+// Last Modified On : Fri Feb  7 19:05:08 2020
+// Update Count     : 6
 // 
 
 // include file uses the CFA keyword "with".
 #if ! defined( with )									// nesting ?
-#define with ``with``									// make keyword an identifier
+#define with ``with										// make keyword an identifier
 #define __CFA_BFDLINK_H__
 #endif
Index: libcfa/src/stdhdr/hwloc.h
===================================================================
--- libcfa/src/stdhdr/hwloc.h	(revision e53e5aa2893d54433622774e08e241eddc7a7c75)
+++ libcfa/src/stdhdr/hwloc.h	(revision 095ac9927ab4898752d1b2c90bc12487bfb282c1)
@@ -10,11 +10,11 @@
 // Created On       : Tue Jul 18 07:45:00 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Feb  1 07:15:39 2020
-// Update Count     : 5
+// Last Modified On : Fri Feb  7 19:05:18 2020
+// Update Count     : 6
 // 
 
 // include file uses the CFA keyword "thread".
 #if ! defined( thread )									// nesting ?
-#define thread ``thread``								// make keyword an identifier
+#define thread ``thread									// make keyword an identifier
 #define __CFA_HWLOC_H__
 #endif
Index: libcfa/src/stdhdr/krb5.h
===================================================================
--- libcfa/src/stdhdr/krb5.h	(revision e53e5aa2893d54433622774e08e241eddc7a7c75)
+++ libcfa/src/stdhdr/krb5.h	(revision 095ac9927ab4898752d1b2c90bc12487bfb282c1)
@@ -10,11 +10,11 @@
 // Created On       : Tue Jul 18 07:55:44 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Feb  1 07:15:47 2020
-// Update Count     : 5
+// Last Modified On : Fri Feb  7 19:05:35 2020
+// Update Count     : 6
 // 
 
 // include file uses the CFA keyword "enable".
 #if ! defined( enable )									// nesting ?
-#define enable ``enable``								// make keyword an identifier
+#define enable ``enable									// make keyword an identifier
 #define __CFA_KRB5_H__
 #endif
Index: libcfa/src/stdhdr/math.h
===================================================================
--- libcfa/src/stdhdr/math.h	(revision e53e5aa2893d54433622774e08e241eddc7a7c75)
+++ libcfa/src/stdhdr/math.h	(revision 095ac9927ab4898752d1b2c90bc12487bfb282c1)
@@ -10,11 +10,11 @@
 // Created On       : Mon Jul  4 23:25:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Feb  1 07:15:58 2020
-// Update Count     : 14
+// Last Modified On : Fri Feb  7 19:05:27 2020
+// Update Count     : 15
 // 
 
 extern "C" {
 #if ! defined( exception )								// nesting ?
-#define exception ``exception``							// make keyword an identifier
+#define exception ``exception							// make keyword an identifier
 #define __CFA_MATH_H__
 #endif
Index: libcfa/src/stdhdr/sys/ucontext.h
===================================================================
--- libcfa/src/stdhdr/sys/ucontext.h	(revision e53e5aa2893d54433622774e08e241eddc7a7c75)
+++ libcfa/src/stdhdr/sys/ucontext.h	(revision 095ac9927ab4898752d1b2c90bc12487bfb282c1)
@@ -10,10 +10,10 @@
 // Created On       : Thu Feb  8 23:48:16 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Feb  1 07:16:05 2020
-// Update Count     : 5
+// Last Modified On : Fri Feb  7 19:05:41 2020
+// Update Count     : 6
 // 
 
 #if ! defined( ftype )									// nesting ?
-#define ftype ``ftype``									// make keyword an identifier
+#define ftype ``ftype									// make keyword an identifier
 #define __CFA_UCONTEXT_H__
 #endif
Index: src/Parser/lex.ll
===================================================================
--- src/Parser/lex.ll	(revision e53e5aa2893d54433622774e08e241eddc7a7c75)
+++ src/Parser/lex.ll	(revision 095ac9927ab4898752d1b2c90bc12487bfb282c1)
@@ -10,6 +10,6 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Sat Feb  1 07:16:44 2020
- * Update Count     : 724
+ * Last Modified On : Fri Feb  7 19:02:43 2020
+ * Update Count     : 725
  */
 
@@ -330,6 +330,6 @@
 				/* identifier */
 {identifier}	{ IDENTIFIER_RETURN(); }
-"``"{identifier}"``" {									// CFA
-	yytext[yyleng - 2] = '\0'; yytext += 2;				// SKULLDUGGERY: remove backquotes (ok to shorten?)
+"``"{identifier} {										// CFA
+	yytext[yyleng] = '\0'; yytext += 2;					// SKULLDUGGERY: remove backquotes (ok to shorten?)
 	IDENTIFIER_RETURN();
 }
Index: tests/quotedKeyword.cfa
===================================================================
--- tests/quotedKeyword.cfa	(revision e53e5aa2893d54433622774e08e241eddc7a7c75)
+++ tests/quotedKeyword.cfa	(revision 095ac9927ab4898752d1b2c90bc12487bfb282c1)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Feb  1 00:02:22 2020
-// Update Count     : 24
+// Last Modified On : Fri Feb  7 19:07:07 2020
+// Update Count     : 25
 //
 
@@ -17,29 +17,29 @@
 
 struct {
-	int ``otype``;
-	int ``struct``;
+	int ``otype;
+	int ``struct;
 } st = { 10, 10 };
 
-typedef int ``forall``;
-``forall`` xxx = 10;
+typedef int ``forall;
+``forall xxx = 10;
 
-int ``_Alignas``, ``_Alignof``, ``__alignof``, ``__alignof__``, ``asm``, ``__asm``, ``__asm__``, ``_At``, ``_Atomic``, ``__attribute``,
-	``__attribute__``, ``auto``, ``_Bool``, ``break``, ``case``, ``catch``, ``catchResume``, ``char``, ``choose``, ``_Complex``, ``__complex``,
-	``__complex__``, ``const``, ``__const``, ``__const__``, ``continue``, ``default``, ``disable``, ``do``, ``double``, ``dtype``, ``else``,
-	``enable``, ``enum``, ``__extension__``, ``extern``, ``fallthru``, ``finally``, ``float``, ``__float128``, ``for``, ``forall``, ``fortran``,
-	``ftype``, ``_Generic``, ``goto``, ``if``, ``_Imaginary``, ``__imag``, ``__imag__``, ``inline``, ``__inline``, ``__inline__``, ``int``,
-	``__int128``, ``__label__``, ``long``, ``lvalue``, ``_Noreturn``, ``__builtin_offsetof``, ``otype``, ``register``, ``restrict``,
-	``__restrict``, ``__restrict__``, ``return``, ``short``, ``signed``, ``__signed``, ``__signed__``, ``sizeof``, ``static``,
-	``_Static_assert``, ``struct``, ``switch``, ``_Thread_local``, ``throw``, ``throwResume``, ``trait``, ``try``, ``typedef``,
-	``typeof``, ``__typeof``, ``__typeof__``, ``union``, ``unsigned``, ``__builtin_va_list``, ``void``, ``volatile``, ``__volatile``,
-	``__volatile__``, ``while``;
+int ``_Alignas, ``_Alignof, ``__alignof, ``__alignof__, ``asm, ``__asm, ``__asm__, ``_At, ``_Atomic, ``__attribute,
+	``__attribute__, ``auto, ``_Bool, ``break, ``case, ``catch, ``catchResume, ``char, ``choose, ``_Complex, ``__complex,
+	``__complex__, ``const, ``__const, ``__const__, ``continue, ``default, ``disable, ``do, ``double, ``dtype, ``else,
+	``enable, ``enum, ``__extension__, ``extern, ``fallthru, ``finally, ``float, ``__float128, ``for, ``forall, ``fortran,
+	``ftype, ``_Generic, ``goto, ``if, ``_Imaginary, ``__imag, ``__imag__, ``inline, ``__inline, ``__inline__, ``int,
+	``__int128, ``__label__, ``long, ``lvalue, ``_Noreturn, ``__builtin_offsetof, ``otype, ``register, ``restrict,
+	``__restrict, ``__restrict__, ``return, ``short, ``signed, ``__signed, ``__signed__, ``sizeof, ``static,
+	``_Static_assert, ``struct, ``switch, ``_Thread_local, ``throw, ``throwResume, ``trait, ``try, ``typedef,
+	``typeof, ``__typeof, ``__typeof__, ``union, ``unsigned, ``__builtin_va_list, ``void, ``volatile, ``__volatile,
+	``__volatile__, ``while;
 
 int main() {
-	int ``if`` = 0;
-	``catch`` = 1;
-	st.``otype`` = 2;
-	st.``struct`` = 3;
-	``throw`` = 4;
-	sout | ``catch`` + st.``otype`` + st.``struct`` + ``throw``;
+	int ``if = 0;
+	``catch = 1;
+	st.``otype = 2;
+	st.``struct = 3;
+	``throw = 4;
+	sout | ``catch + st.``otype + st.``struct + ``throw;
 }