diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index 446610f..0395f61 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -55,7 +55,7 @@ jobs:
           build/regaddralias
           build/x25519
           build/verifyhost
-          build/autoconf_i2pd
+          build/autoconf
 
   build-macos:
     name: Build macOS with UPnP ON
@@ -106,7 +106,7 @@ jobs:
           build/regaddralias
           build/x25519
           build/verifyhost
-          build/autoconf_i2pd
+          build/autoconf
 
   build-macos-legacy:
     name: Build macOS Legacy with UPnP ON
@@ -157,7 +157,7 @@ jobs:
           build/regaddralias
           build/x25519
           build/verifyhost
-          build/autoconf_i2pd
+          build/autoconf
 
   build-freebsd:
     name: Build FreeBSD with UPnP ON
@@ -203,7 +203,7 @@ jobs:
           build/regaddralias
           build/x25519
           build/verifyhost
-          build/autoconf_i2pd
+          build/autoconf
 
   build-windows-ucrt:
     name: Build Windows UCRT x64
@@ -251,7 +251,7 @@ jobs:
           ./regaddralias.exe
           ./x25519.exe
           ./verifyhost.exe
-          ./autoconf_i2pd.exe
+          ./autoconf.exe
 
   build-windows-arm:
     name: Build Windows ARM64
@@ -299,7 +299,7 @@ jobs:
           ./regaddralias.exe
           ./x25519.exe
           ./verifyhost.exe
-          ./autoconf_i2pd.exe
+          ./autoconf.exe
 
   release:
     name: Create Continuous Release
diff --git a/.gitignore b/.gitignore
index 83870eb..38d6a5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,6 @@ offlinekeys
 regaddr_3ld
 verifyhost
 x25519
-autoconf_i2pd
 *.exe
 
 # private key files
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f469526..7bfbbb9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -407,7 +407,7 @@ set(TOOLS
     regaddralias
     x25519
     verifyhost
-    autoconf_i2pd
+    autoconf
 )
 
 foreach(tool IN LISTS TOOLS)
diff --git a/Makefile b/Makefile
index ab9d3b3..ce72543 100755
--- a/Makefile
+++ b/Makefile
@@ -49,13 +49,13 @@ endif
 # -------------------------
 # Targets
 # -------------------------
-all: $(I2PD_LIB) vain keygen keyinfo famtool routerinfo regaddr regaddr_3ld i2pbase64 offlinekeys b33address regaddralias x25519 verifyhost autoconf_i2pd
+all: $(I2PD_LIB) vain keygen keyinfo famtool routerinfo regaddr regaddr_3ld i2pbase64 offlinekeys b33address regaddralias x25519 verifyhost autoconf
 
 vain: vain.o $(I2PD_LIB)
 	$(CXX) -o vain $(LDFLAGS) vain.o $(LDLIBS)
 
-autoconf_i2pd: autoconf_i2pd.o $(I2PD_LIB)
-	$(CXX) -o autoconf_i2pd $(DEFINES) $(LDFLAGS) autoconf_i2pd.o $(LDLIBS)
+autoconf: autoconf.o $(I2PD_LIB)
+	$(CXX) -o autoconf $(DEFINES) $(LDFLAGS) autoconf.o $(LDLIBS)
 
 routerinfo: routerinfo.o $(I2PD_LIB)
 	$(CXX) -o routerinfo $(LDFLAGS) routerinfo.o $(LDLIBS)
@@ -117,14 +117,14 @@ clean-obj:
 	rm -f $(wildcard *.o)
 
 stripall:
-	strip b33address famtool i2pbase64 keygen keyinfo offlinekeys regaddr regaddr_3ld regaddralias routerinfo x25519 verifyhost vain autoconf_i2pd
+	strip b33address famtool i2pbase64 keygen keyinfo offlinekeys regaddr regaddr_3ld regaddralias routerinfo x25519 verifyhost vain autoconf
 
 builddir:
 	mkdir -p build
-	mv b33address famtool i2pbase64 keygen keyinfo offlinekeys regaddr regaddr_3ld regaddralias routerinfo x25519 verifyhost vain autoconf_i2pd build/ || true
+	mv b33address famtool i2pbase64 keygen keyinfo offlinekeys regaddr regaddr_3ld regaddralias routerinfo x25519 verifyhost vain autoconf build/ || true
 
 clean-bin:
-	rm -f b33address famtool i2pbase64 keygen keyinfo offlinekeys regaddr regaddr_3ld regaddralias routerinfo x25519 verifyhost vain autoconf_i2pd
+	rm -f b33address famtool i2pbase64 keygen keyinfo offlinekeys regaddr regaddr_3ld regaddralias routerinfo x25519 verifyhost vain autoconf
 
 clean: clean-i2pd clean-obj clean-bin
 
diff --git a/autoconf_i2pd.cpp b/autoconf.cpp
similarity index 100%
rename from autoconf_i2pd.cpp
rename to autoconf.cpp