diff --git a/lbfgsb_entry.f90 b/lbfgsb__entry.f90
similarity index 97%
rename from lbfgsb_entry.f90
rename to lbfgsb__entry.f90
index b233bb3..61da6ee 100644
--- a/lbfgsb_entry.f90
+++ b/lbfgsb__entry.f90
@@ -8,7 +8,7 @@
 ! (There is no way to enforce this interface with the old code without
 ! integrating it into the old code.  This could be done relatively
 ! easily but I have chosen to leave the original as is for now.)
-module lbfgsb_entry
+module lbfgsb
   implicit none
   private
 
@@ -48,4 +48,4 @@ subroutine setulb(n, m, x, l, u, nbd, f, g, factr, pgtol, &
      end subroutine setulb
   end interface
 
-end module lbfgsb_entry
+end module lbfgsb
diff --git a/lbfgsb_c.f90 b/lbfgsb_c.f90
index 496b7f6..263aaa4 100644
--- a/lbfgsb_c.f90
+++ b/lbfgsb_c.f90
@@ -9,7 +9,7 @@
 ! used by other code and not just Go.
 module lbfgsb_c
   use, intrinsic :: iso_c_binding
-  use lbfgsb_entry
+  use lbfgsb
   implicit none
   private
 
diff --git a/makefile b/makefile
index 224e061..45f1e16 100644
--- a/makefile
+++ b/makefile
@@ -44,13 +44,13 @@ lbfgsb/lbfgsb.o: lbfgsb/blas.o lbfgsb/linpack.o lbfgsb/timer.o
 # The Linpack parts do not appear to depend on each other
 
 # Go-Fortran L-BFGS-B interface
-lbfgsb_entry.o: lbfgsb/lbfgsb.o
-lbfgsb_c.o: lbfgsb_entry.o
+lbfgsb__entry.o: lbfgsb/lbfgsb.o
+lbfgsb_c.o: lbfgsb__entry.o
 
 # Libraries and executables
 
 # Object files needed for the libraries
-libObjs := lbfgsb_c.o lbfgsb_entry.o lbfgsb/lbfgsb.o lbfgsb/blas.o lbfgsb/linpack.o lbfgsb/timer.o
+libObjs := lbfgsb_c.o lbfgsb__entry.o lbfgsb/lbfgsb.o lbfgsb/blas.o lbfgsb/linpack.o lbfgsb/timer.o
 
 # Library
 liblbfgsb.a: $(libObjs)