diff --git a/common.mk b/common.mk
index 02f1360..07504cc 100644
--- a/common.mk
+++ b/common.mk
@@ -20,4 +20,4 @@ PREFIX = /usr/local
 LIBDIR = lib64
 INSTALL_BINDIR = $(PREFIX)/bin
 INSTALL_LIBDIR = $(PREFIX)/$(LIBDIR)
-INSTALL_INCLUDEDIR = $(PREFIX)/include
+INSTALL_INCLUDEDIR = $(PREFIX)/include/ntru
diff --git a/include/Makefile b/include/Makefile
index 050ad2c..85b648a 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -10,17 +10,17 @@ doc-pdf: doc
 install:
 	$(INSTALL_DIR) "$(DESTDIR)$(INSTALL_INCLUDEDIR)"
 	$(INSTALL) ntru.h "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/ntru.h
-	$(INSTALL) ntru_decrypt.h "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/ntru_decrypt.h
-	$(INSTALL) ntru_encrypt.h "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/ntru_encrypt.h
-	$(INSTALL) ntru_keypair.h "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/ntru_keypair.h
-	$(INSTALL) ntru_rnd.h "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/ntru_rnd.h
+	$(INSTALL) decrypt.h "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/decrypt.h
+	$(INSTALL) encrypt.h "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/encrypt.h
+	$(INSTALL) keypair.h "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/keypair.h
+	$(INSTALL) rnd.h "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/rnd.h
 
 uninstall:
 	$(RM) "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/ntru.h
-	$(RM) "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/ntru_decrypt.h
-	$(RM) "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/ntru_encrypt.h
-	$(RM) "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/ntru_keypair.h
-	$(RM) "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/ntru_rnd.h
+	$(RM) "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/decrypt.h
+	$(RM) "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/encrypt.h
+	$(RM) "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/keypair.h
+	$(RM) "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/rnd.h
 
 clean:
 	rm -rf html/ latex/
diff --git a/include/ntru_decrypt.h b/include/decrypt.h
similarity index 98%
rename from include/ntru_decrypt.h
rename to include/decrypt.h
index b7223ba..aafac61 100644
--- a/include/ntru_decrypt.h
+++ b/include/decrypt.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file ntru_decrypt.h
+ * @file decrypt.h
  * This file holds the public API of decryption
  * of the pqc NTRU implementation and is
  * meant to be installed on the client system.
diff --git a/include/ntru_encrypt.h b/include/encrypt.h
similarity index 98%
rename from include/ntru_encrypt.h
rename to include/encrypt.h
index a681dd5..b1c0f81 100644
--- a/include/ntru_encrypt.h
+++ b/include/encrypt.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file ntru_encrypt.h
+ * @file encrypt.h
  * This file holds the public API of encryption
  * of the pqc NTRU implementation and is
  * meant to be installed on the client system.
diff --git a/include/ntru_keypair.h b/include/keypair.h
similarity index 99%
rename from include/ntru_keypair.h
rename to include/keypair.h
index 94c697e..e494591 100644
--- a/include/ntru_keypair.h
+++ b/include/keypair.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file ntru_keypair.h
+ * @file keypair.h
  * This file holds the public API of generating,
  * exporting and importing public and private keys
  * of the pqc NTRU implementation and is
diff --git a/include/ntru_rnd.h b/include/rnd.h
similarity index 98%
rename from include/ntru_rnd.h
rename to include/rnd.h
index 5b43bc4..3524cd1 100644
--- a/include/ntru_rnd.h
+++ b/include/rnd.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file ntru_rnd.h
+ * @file rnd.h
  * This file holds the public API of generating
  * random ternary polynomials of the pqc NTRU
  * implementation and is meant to be installed