diff -r 2354c9058fb6 -r e87c231afb77 src/CLIParser.h
--- a/src/CLIParser.h	Sat Jun 06 01:50:45 2020 +0200
+++ b/src/CLIParser.h	Fri Sep 25 01:59:16 2020 +0200
@@ -26,7 +26,7 @@
 
 namespace relpipe {
 namespace tr {
-namespace guile {
+namespace scheme {
 
 class CLIParser {
 private:
@@ -75,11 +75,11 @@
 		for (int i = 0; i < arguments.size();) {
 			string_t option = readNext(arguments, i);
 
-			if (option == OPTION_BEFORE_RECORDS) currentRelation.guileBeforeRecords = readNext(arguments, i);
-			else if (option == OPTION_AFTER_RECORDS) currentRelation.guileAfterRecords = readNext(arguments, i);
-			else if (option == OPTION_FOR_EACH) currentRelation.guileForEach = readNext(arguments, i);
-			else if (option == OPTION_WHERE) currentRelation.guileWhere = readNext(arguments, i);
-			else if (option == OPTION_HAS_MORE_RECORDS) currentRelation.guileHasMoreRecords = readNext(arguments, i);
+			if (option == OPTION_BEFORE_RECORDS) currentRelation.schemeBeforeRecords = readNext(arguments, i);
+			else if (option == OPTION_AFTER_RECORDS) currentRelation.schemeAfterRecords = readNext(arguments, i);
+			else if (option == OPTION_FOR_EACH) currentRelation.schemeForEach = readNext(arguments, i);
+			else if (option == OPTION_WHERE) currentRelation.schemeWhere = readNext(arguments, i);
+			else if (option == OPTION_HAS_MORE_RECORDS) currentRelation.schemeHasMoreRecords = readNext(arguments, i);
 			else if (option == OPTION_DROP) currentRelation.drop = true;
 			else if (option == OPTION_INPUT_ATTRIBUTES_APPEND) currentRelation.inputAttributesAppend = true;
 			else if (option == OPTION_INPUT_ATTRIBUTES_PREPEND) currentRelation.inputAttributesPrepend = true;