diff --git a/Makefile b/Makefile
index c54c421..08452c6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Build the cpdf command line tools and top level
-MODS = cpdfstream tjutil tjutf16 tjllist tjparserMonad tjjson xmlm \
-       cpdfJSON cpdfstrftime cpdfcoord \
+MODS = cpdfstream tjutil tjutf16 tjllist tjparsermonad tjjson \
+       xmlm cpdfjson cpdfstrftime cpdfcoord \
        cpdfpagespec cpdfposition cpdf cpdfcommand
 
 SOURCES = $(foreach x,$(MODS),$(x).ml $(x).mli) cpdfcommandrun.ml
diff --git a/cpdfcommand.ml b/cpdfcommand.ml
index 3d70e8f..c9a54d9 100644
--- a/cpdfcommand.ml
+++ b/cpdfcommand.ml
@@ -1171,7 +1171,7 @@ let set_input s =
 let set_json_input s =
   args.original_filename <- s;
   let fh = open_in_bin s in
-  let pdf = CpdfJSON.of_input (Pdfio.input_of_channel fh) in
+  let pdf = Cpdfjson.of_input (Pdfio.input_of_channel fh) in
     close_in fh;
     args.inputs <- (AlreadyInMemory pdf, "all", "", "", ref false, None)::args.inputs
 
@@ -3457,10 +3457,10 @@ let write_json output pdf =
   | NoOutputSpecified ->
       error "-output-json: no output name specified"
   | Stdout ->
-      CpdfJSON.to_output (Pdfio.output_of_channel stdout) args.jsonparsecontentstreams args.jsonnostreamdata pdf
+      Cpdfjson.to_output (Pdfio.output_of_channel stdout) args.jsonparsecontentstreams args.jsonnostreamdata pdf
   | File filename ->
       let f = open_out filename in
-        CpdfJSON.to_output (Pdfio.output_of_channel f) args.jsonparsecontentstreams args.jsonnostreamdata pdf;
+        Cpdfjson.to_output (Pdfio.output_of_channel f) args.jsonparsecontentstreams args.jsonnostreamdata pdf;
         close_out f
 
 (* Main function *)
diff --git a/cpdfJSON.ml b/cpdfjson.ml
similarity index 100%
rename from cpdfJSON.ml
rename to cpdfjson.ml
diff --git a/cpdfJSON.mli b/cpdfjson.mli
similarity index 100%
rename from cpdfJSON.mli
rename to cpdfjson.mli
diff --git a/tjjson.ml b/tjjson.ml
index c9caed0..1eb1b0e 100644
--- a/tjjson.ml
+++ b/tjjson.ml
@@ -23,8 +23,8 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.*)
 
 open Tjutil
-open TjparserMonad
-module P = TjparserMonad
+open Tjparsermonad
+module P = Tjparsermonad
 
 type t =
   | String of string
diff --git a/tjparserMonad.ml b/tjparsermonad.ml
similarity index 100%
rename from tjparserMonad.ml
rename to tjparsermonad.ml
diff --git a/tjparserMonad.mli b/tjparsermonad.mli
similarity index 100%
rename from tjparserMonad.mli
rename to tjparsermonad.mli