diff --git a/cfp/cfpheader.cpp b/cfp/cfpheader.cpp
index efadd8677..b4b66e09e 100644
--- a/cfp/cfpheader.cpp
+++ b/cfp/cfpheader.cpp
@@ -2,7 +2,7 @@
 #include "zfp/array2.hpp"
 #include "zfp/array3.hpp"
 #include "zfp/array4.hpp"
-#include "zfp/internal/array/zfpheader.hpp"
+#include "zfp/internal/codec/zfpheader.hpp"
 #include "zfp/internal/cfp/header.h"
 #include "zfp/internal/cfp/array1f.h"
 #include "zfp/internal/cfp/array1d.h"
diff --git a/fortran/CMakeLists.txt b/fortran/CMakeLists.txt
index 51799401b..9c3763489 100644
--- a/fortran/CMakeLists.txt
+++ b/fortran/CMakeLists.txt
@@ -21,8 +21,8 @@ set_property(TARGET zFORp PROPERTY SOVERSION ${ZFP_VERSION_MAJOR})
 set_property(TARGET zFORp PROPERTY OUTPUT_NAME ${ZFP_LIBRARY_PREFIX}zFORp)
 
 # install location for module file
-install(FILES ${CMAKE_Fortran_MODULE_DIRECTORY}/zforp.mod
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zfp)
+install(FILES ${CMAKE_Fortran_MODULE_DIRECTORY}/zfp.mod
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
 # install location for library
 install(TARGETS zFORp EXPORT cFORp-targets
diff --git a/fortran/zfp.f90 b/fortran/zfp.f90
index 8042f2159..8b884a5ee 100644
--- a/fortran/zfp.f90
+++ b/fortran/zfp.f90
@@ -1,4 +1,4 @@
-module zFORp
+module zfp
 
   use, intrinsic :: iso_c_binding, only: c_int, c_int64_t, c_size_t, c_ptrdiff_t, c_double, c_ptr, c_null_ptr, c_loc
   implicit none
@@ -1113,4 +1113,4 @@ function zFORp_read_header(stream, field, mask) result(num_bits_read) bind(c, na
     num_bits_read = zfp_read_header(stream%object, field%object, int(mask, c_int))
   end function zFORp_read_header
 
-end module zFORp
+end module zfp
diff --git a/include/zfp/codec/zfpcodec.hpp b/include/zfp/codec/zfpcodec.hpp
index 96399b710..fd9f4be19 100644
--- a/include/zfp/codec/zfpcodec.hpp
+++ b/include/zfp/codec/zfpcodec.hpp
@@ -115,7 +115,7 @@ class zfp_base {
   static const zfp_type type = zfp::trait<Scalar>::type; // scalar type
 
   // zfp::codec::zfp_base::header class for array (de)serialization
-  #include "zfp/internal/array/zfpheader.hpp"
+  #include "zfp/internal/codec/zfpheader.hpp"
 
 protected:
   // deep copy
diff --git a/include/zfp/internal/array/zfpheader.hpp b/include/zfp/internal/codec/zfpheader.hpp
similarity index 100%
rename from include/zfp/internal/array/zfpheader.hpp
rename to include/zfp/internal/codec/zfpheader.hpp