diff --git a/Makefile.am b/Makefile.am
index 5c5c59225..744e56874 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -111,6 +111,7 @@ test: check
 tests/unit.log: testsuite/testsuite.log
 
 DISTCLEANFILES+= cyassl-config
+DISTCLEANFILES+= wolfssl-config
 # fips files shouldn't be left after make distclean
 DISTCLEANFILES+= ctaocrypt/src/fips.c
 DISTCLEANFILES+= ctaocrypt/src/fips_test.c
diff --git a/configure.ac b/configure.ac
index db5f658e1..6ede2d7b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@
 #
 #
 
-AC_INIT([cyassl],[3.3.0],[https://github.com/wolfssl/wolfssl/issues],[cyassl],[http://www.wolfssl.com])
+AC_INIT([wolfssl],[3.3.0],[https://github.com/wolfssl/wolfssl/issues],[wolfssl],[http://www.wolfssl.com])
 
 AC_CONFIG_AUX_DIR([build-aux])
 
@@ -1772,8 +1772,8 @@ AC_SUBST([AM_LDFLAGS])
 # FINAL
 AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
 AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([cyassl/version.h])
-AC_CONFIG_FILES([cyassl/options.h])
+AC_CONFIG_FILES([wolfssl/version.h])
+AC_CONFIG_FILES([wolfssl/options.h])
 AC_CONFIG_FILES([support/wolfssl.pc])
 AC_CONFIG_FILES([rpm/spec])
 
@@ -1797,7 +1797,7 @@ echo
 echo "---"
 echo "Generating user options header..."
 
-OPTION_FILE="cyassl/options.h"
+OPTION_FILE="wolfssl/options.h"
 
 rm -f $OPTION_FILE