--- ./src/flex.skl.old	2016-10-21 03:43:44.000000000 +0300
+++ ./src/flex.skl	2016-11-10 20:04:55.000000000 +0200
@@ -106,7 +106,8 @@
 m4_ifdef( [[M4_YY_PREFIX]],, [[m4_define([[M4_YY_PREFIX]], [[yy]])]])
 
 m4preproc_define(`M4_GEN_PREFIX',
-    ``m4_define(yy[[$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'')
+    ``[[#define yy$1 ]]M4_YY_PREFIX[[$1]]
+m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'')
 
 %if-c++-only
     /* The c++ scanner is a mess. The FlexLexer.h header file relies on the
--- ./tests/array_r.l.old	2016-10-21 03:43:44.000000000 +0300
+++ ./tests/array_r.l		2016-11-10 20:07:52.000000000 +0200
@@ -49,13 +49,13 @@
 {
     yyscan_t lexer;
     
-	testlex_init(&lexer);
-    testset_in(stdin, lexer);
-    testset_out(stdout, lexer);
+	yylex_init(&lexer);
+    yyset_in(stdin, lexer);
+    yyset_out(stdout, lexer);
 	
-    testlex( lexer );
+    yylex( lexer );
 	
-    testlex_destroy( lexer);
+    yylex_destroy( lexer);
     printf("TEST RETURNING OK.\n");
 
     return 0;