Index: tools/voice.pl
===================================================================
--- tools/voice.pl	(revision 18230)
+++ tools/voice.pl	(working copy)
@@ -324,7 +324,7 @@
     }
 }
 
-# Run genlang and create voice clips for each string
+# Run langtool and create voice clips for each string
 sub generateclips {
     our $verbose;
     my ($language, $target, $encoder, $encoder_opts, $tts_engine, $tts_engine_opts) = @_;
@@ -332,7 +332,7 @@
     my $langfile = dirname($0) . '/../apps/lang/' . $language . '.lang';
     my $id = '';
     my $voice = '';
-    my $cmd = "genlang -o -t=$target -e=$english $langfile 2>/dev/null";
+    my $cmd = "langtool -o -t=$target -e=$english $langfile 2>/dev/null";
     my $pool_file;
     open(VOICEFONTIDS, ">:utf8", "voicefontids");
     my $i = 0;
Index: apps/Makefile
===================================================================
--- apps/Makefile	(revision 18230)
+++ apps/Makefile	(working copy)
@@ -211,7 +211,7 @@
 
 # apps/features.txt is a file that (is preprocessed and) lists named features
 # based on defines in the config-*.h files. The named features will be passed
-# to genlang and thus (translated) phrases can be used based on those names.
+# to langtool and thus (translated) phrases can be used based on those names.
 # button.h is included for the HAS_BUTTON_HOLD define.
 #
 
@@ -221,11 +221,11 @@
 	$(TARGET) $(DEFINES) $(EXTRA_DEFINES) -E -P -imacros "config.h" -imacros "button.h" - | \
 	grep -v "^\#" | grep -v "^$$" > $@; \
 	for f in `cat $(OBJDIR)/features`; do feat="$$feat:$$f" ; done ; \
-	echo "$$feat" >$(OBJDIR)/genlang-features
+	echo "$$feat" >$(OBJDIR)/langtool-features
 
 $(OBJDIR)/lang.o: lang/$(LANGUAGE).lang $(OBJDIR)/features
 	$(SILENT)for f in `cat $(OBJDIR)/features`; do feat="$$feat:$$f" ; done; \
-	perl -s $(TOOLSDIR)/genlang -p=$(BUILDDIR)/lang -t=$(MODELNAME)$$feat $<
+	perl -s $(TOOLSDIR)/langtool -p=$(BUILDDIR)/lang -t=$(MODELNAME)$$feat $<
 	$(call PRINTS,CC lang.c)$(CC) $(CFLAGS) -c $(BUILDDIR)/lang.c -o $@
 
 clean:
Index: apps/lang/Makefile
===================================================================
--- apps/lang/Makefile	(revision 18230)
+++ apps/lang/Makefile	(working copy)
@@ -21,7 +21,7 @@
 OUTP = $(patsubst %.lang,$(OBJDIR)/%.lng, $(SOURCES))
 
 # the generated file with features specified genlang-style
-FEATS=$(BUILDDIR)/apps/genlang-features
+FEATS=$(BUILDDIR)/apps/langtool-features
 
 ifndef V
 SILENT=@
@@ -33,7 +33,7 @@
 # generic rule for creating .lng from .lang
 $(OBJDIR)/%.lng : %.lang $(FEATS)
 	$(call PRINTS,GENLANG $<)
-	$(SILENT)$(TOOLSDIR)/genlang -e=$(APPSDIR)/lang/english.lang -t=$(MODELNAME)`cat $(FEATS)` -i=$(TARGET_ID) -b=$@ $<
+	$(SILENT)$(TOOLSDIR)/langtool -e=$(APPSDIR)/lang/english.lang -t=$(MODELNAME)`cat $(FEATS)` -i=$(TARGET_ID) -b=$@ $<
 
 $(HEADER): $(OUTP)
 	$(call PRINTS,Make $(HEADER))