diff --git a/.gitignore b/.gitignore
index e1ee3c4e..b07cb253 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,8 +26,8 @@ aesgcm
 aesgcm.exe
 constants
 constants.exe
-ltcrypt
-ltcrypt.exe
+crypt
+crypt.exe
 hashsum
 hashsum.exe
 multi
diff --git a/README.md b/README.md
index 661fdbcc..d6850637 100644
--- a/README.md
+++ b/README.md
@@ -100,14 +100,14 @@ The following list does not claim to be complete resp. to be available across al
 | *empty target*/none given | c.f. `library`
 | `library` | builds only the library |
 | `hashsum` | builds the `hashsum` binary, similar to [`shasum`](https://linux.die.net/man/1/shasum), but with support for all hash-algorithms included in the library *\*4* |
-| `ltcrypt` | builds the `ltcrypt` binary, implementing something similar to [`crypt`](https://linux.die.net/man/3/crypt) *\*4* |
+| `crypt` | builds the `crypt` binary, implementing something similar to [`crypt`](https://linux.die.net/man/3/crypt) *\*4* |
 | `sizes` | builds the `sizes` binary, printing all internal data sizes on invocation *\*4* |
 | `constants` | builds the `constants` binary, printing all internal constants on invocation *\*4* |
 | `openssl-enc` | builds the `openssl-enc` binary, which is more or less compatible to [`openssl enc`](https://linux.die.net/man/1/enc) *\*4* *\*5* |
 | `test` | builds the `test` binary, which runs all algorithm self-tests + some extended tests *\*4* |
 | `timing` | builds the `timing` binary, which can be used to measure timings for algorithms and modes *\*4* |
 | `bins` | builds `hashsum` *\*4* |
-| `all_test` | builds `test`, `hashsum`, `ltcrypt`, `small`, `tv_gen`, `sizes` & `constants` *\*4* |
+| `all_test` | builds `test`, `hashsum`, `crypt`, `small`, `tv_gen`, `sizes` & `constants` *\*4* |
 | `docs` | builds the developer documentation `doc/crypt.pdf` |
 | `install` | installs the `library` and header files *\*7* *\*8* |
 | `install_bins` | installs the binaries created by the `bins` target *\*7* *\*8* |
diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
index 0e6b885d..161b706c 100644
--- a/demos/CMakeLists.txt
+++ b/demos/CMakeLists.txt
@@ -2,7 +2,7 @@
 # Options
 #-----------------------------------------------------------------------------
 option(BUILD_USEFUL_DEMOS "Build useful demos (hashsum)" FALSE)
-option(BUILD_USABLE_DEMOS "Build usable demos (ltcrypt sizes constants pem-info)" FALSE)
+option(BUILD_USABLE_DEMOS "Build usable demos (crypt sizes constants pem-info)" FALSE)
 option(BUILD_TEST_DEMOS "Build test demos (small tv_gen)" FALSE)
 
 #-----------------------------------------------------------------------------
@@ -30,14 +30,14 @@ endif()
 
 if(BUILD_USABLE_DEMOS)
 
-    list(APPEND ALL_DEMOS_TARGETS ltcrypt sizes constants pem-info)
+    list(APPEND ALL_DEMOS_TARGETS crypt sizes constants pem-info)
 
     # ltcrypt
-    add_executable(ltcrypt
-        ${CMAKE_CURRENT_SOURCE_DIR}/ltcrypt.c
+    add_executable(crypt
+        ${CMAKE_CURRENT_SOURCE_DIR}/crypt.c
     )
 
-    target_link_libraries(ltcrypt PRIVATE
+    target_link_libraries(crypt PRIVATE
         ${PROJECT_NAME}
     )
 
diff --git a/demos/ltcrypt.c b/demos/crypt.c
similarity index 100%
rename from demos/ltcrypt.c
rename to demos/crypt.c
diff --git a/makefile.mingw b/makefile.mingw
index 36320f19..dd5fd0ba 100644
--- a/makefile.mingw
+++ b/makefile.mingw
@@ -284,8 +284,8 @@ $(LIBMAIN_D) $(LIBMAIN_I): $(OBJECTS)
 #Demo tools/utilities
 hashsum.exe: demos/hashsum.o $(LIBMAIN_S)
 	$(CC) demos/hashsum.o $(LIBMAIN_S) $(LTC_LDFLAGS) -o $@
-ltcrypt.exe: demos/ltcrypt.o $(LIBMAIN_S)
-	$(CC) demos/ltcrypt.o $(LIBMAIN_S) $(LTC_LDFLAGS) -o $@
+crypt.exe: demos/crypt.o $(LIBMAIN_S)
+	$(CC) demos/crypt.o $(LIBMAIN_S) $(LTC_LDFLAGS) -o $@
 small.exe: demos/small.o $(LIBMAIN_S)
 	$(CC) demos/small.o $(LIBMAIN_S) $(LTC_LDFLAGS) -o $@
 tv_gen.exe: demos/tv_gen.o $(LIBMAIN_S)
@@ -302,7 +302,7 @@ test.exe: $(TOBJECTS) $(LIBMAIN_S)
 	$(CC) $(TOBJECTS) $(LIBMAIN_S) $(LTC_LDFLAGS) -o $@
 	@echo NOTICE: start the tests by launching test.exe
 
-all: $(LIBMAIN_S) $(LIBMAIN_I) $(LIBMAIN_D) hashsum.exe ltcrypt.exe small.exe tv_gen.exe sizes.exe constants.exe timing.exe test.exe
+all: $(LIBMAIN_S) $(LIBMAIN_I) $(LIBMAIN_D) hashsum.exe crypt.exe small.exe tv_gen.exe sizes.exe constants.exe timing.exe test.exe
 
 test: test.exe
 
diff --git a/makefile.msvc b/makefile.msvc
index a2bf0ebe..13ba47f5 100644
--- a/makefile.msvc
+++ b/makefile.msvc
@@ -271,8 +271,8 @@ $(LIBMAIN_S): $(OBJECTS)
 #Demo tools/utilities
 hashsum.exe: demos/hashsum.c tests/common.c $(LIBMAIN_S)
 	cl $(LTC_CFLAGS) demos/hashsum.c tests/common.c $(LIBMAIN_S) $(LTC_LDFLAGS) /Fe$@
-ltcrypt.exe: demos/ltcrypt.c $(LIBMAIN_S)
-	cl $(LTC_CFLAGS) demos/ltcrypt.c tests/common.c $(LIBMAIN_S) $(LTC_LDFLAGS) /Fe$@
+crypt.exe: demos/crypt.c $(LIBMAIN_S)
+	cl $(LTC_CFLAGS) demos/crypt.c tests/common.c $(LIBMAIN_S) $(LTC_LDFLAGS) /Fe$@
 small.exe: demos/small.c $(LIBMAIN_S)
 	cl $(LTC_CFLAGS) demos/small.c tests/common.c $(LIBMAIN_S) $(LTC_LDFLAGS) /Fe$@
 tv_gen.exe: demos/tv_gen.c $(LIBMAIN_S)
@@ -289,7 +289,7 @@ test.exe: $(LIBMAIN_S) $(TOBJECTS)
 	cl $(LTC_CFLAGS) $(TOBJECTS) $(LIBMAIN_S) $(LTC_LDFLAGS) /Fe$@
 	@echo NOTICE: start the tests by launching test.exe
 
-all: $(LIBMAIN_S) hashsum.exe ltcrypt.exe small.exe tv_gen.exe sizes.exe constants.exe timing.exe test.exe
+all: $(LIBMAIN_S) hashsum.exe crypt.exe small.exe tv_gen.exe sizes.exe constants.exe timing.exe test.exe
 
 test: test.exe
 
diff --git a/makefile.unix b/makefile.unix
index a65685ad..e498209a 100644
--- a/makefile.unix
+++ b/makefile.unix
@@ -295,8 +295,8 @@ $(LIBMAIN_S): $(OBJECTS)
 #Demo tools/utilities
 hashsum: demos/hashsum.o $(LIBMAIN_S)
 	$(CC) demos/hashsum.o $(LIBMAIN_S) $(LTC_LDFLAGS) -o $@
-ltcrypt: demos/ltcrypt.o $(LIBMAIN_S)
-	$(CC) demos/ltcrypt.o $(LIBMAIN_S) $(LTC_LDFLAGS) -o $@
+crypt: demos/crypt.o $(LIBMAIN_S)
+	$(CC) demos/crypt.o $(LIBMAIN_S) $(LTC_LDFLAGS) -o $@
 small: demos/small.o $(LIBMAIN_S)
 	$(CC) demos/small.o $(LIBMAIN_S) $(LTC_LDFLAGS) -o $@
 tv_gen: demos/tv_gen.o $(LIBMAIN_S)
@@ -313,15 +313,15 @@ test: $(TOBJECTS) $(LIBMAIN_S)
 	$(CC) $(TOBJECTS) $(LIBMAIN_S) $(LTC_LDFLAGS) -o $@
 	@echo "NOTICE: start the tests by: ./test"
 
-all: $(LIBMAIN_S) hashsum ltcrypt small tv_gen sizes constants timing test
+all: $(LIBMAIN_S) hashsum crypt small tv_gen sizes constants timing test
 
 #NOTE: this makefile works also on cygwin, thus we need to delete *.exe
 clean:
 	-@rm -f $(OBJECTS) $(TOBJECTS)
 	-@rm -f $(LIBMAIN_S)
 	-@rm -f demos/*.o *_tv.txt
-	-@rm -f test constants sizes tv_gen hashsum ltcrypt small timing
-	-@rm -f test.exe constants.exe sizes.exe tv_gen.exe hashsum.exe ltcrypt.exe small.exe timing.exe
+	-@rm -f test constants sizes tv_gen hashsum crypt small timing
+	-@rm -f test.exe constants.exe sizes.exe tv_gen.exe hashsum.exe crypt.exe small.exe timing.exe
 
 #Install the library + headers
 install: $(LIBMAIN_S)
diff --git a/makefile_include.mk b/makefile_include.mk
index 4d43664f..95076a74 100644
--- a/makefile_include.mk
+++ b/makefile_include.mk
@@ -168,7 +168,7 @@ TEST=test
 USEFUL_DEMOS   = hashsum
 
 # Demos that are usable but only rarely make sense to be installed
-USEABLE_DEMOS  = ltcrypt sizes constants pem-info
+USEABLE_DEMOS  = crypt sizes constants pem-info
 
 # Demos that are used for testing or measuring
 TEST_DEMOS     = small tv_gen