diff --git a/C/Makefile b/C/Makefile
index 30f44e26..a0cb5342 100644
--- a/C/Makefile
+++ b/C/Makefile
@@ -1,4 +1,4 @@
-OBJS := bitstream.o dag.o deserialize.o eval.o frame.o jets.o jets-secp256k1.o rsort.o sha256.o type.o typeInference.o elements/env.o elements/exec.o elements/ops.o elements/jets.o elements/primitive.o elements/cmr.o elements/txEnv.o
+OBJS := bitstream.o dag.o deserialize.o eval.o frame.o jets.o jets-secp256k1.o rsort.o sha256.o type.o typeInference.o elements/env.o elements/exec.o elements/ops.o elements/elementsJets.o elements/primitive.o elements/cmr.o elements/txEnv.o
 TEST_OBJS := test.o ctx8Pruned.o ctx8Unpruned.o hashBlock.o regression4.o schnorr0.o schnorr6.o typeSkipTest.o elements/checkSigHashAllTx1.o
 
 # From https://fastcompression.blogspot.com/2019/01/compiler-warnings.html
@@ -14,7 +14,7 @@ CFLAGS := $(CFLAGS) -I include
 jets-secp256k1.o: jets-secp256k1.c
 	$(CC) -c $(CFLAGS) $(CWARN) -Wno-conversion $(CPPFLAGS) -o $@ $<
 
-elements/jets.o: elements/jets.c
+elements/elementsJets.o: elements/elementsJets.c
 	$(CC) -c $(CFLAGS) $(CWARN) -Wno-switch-enum -Wswitch $(CPPFLAGS) -o $@ $<
 
 sha256.o: sha256.c
diff --git a/C/elements-sources.mk b/C/elements-sources.mk
index 2bb32e1e..1c0dc4b9 100644
--- a/C/elements-sources.mk
+++ b/C/elements-sources.mk
@@ -26,7 +26,7 @@ ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/typeInference.c
 ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/elements/cmr.c
 ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/elements/env.c
 ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/elements/exec.c
-ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/elements/jets.c
+ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/elements/elementsJets.c
 ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/elements/ops.c
 ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/elements/primitive.c
 ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/elements/txEnv.c
@@ -90,7 +90,7 @@ ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/secp256k1/secp256k1_impl.h
 ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/secp256k1/util.h
 
 ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/elements/decodeElementsJets.inc
-ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/elements/jets.h
+ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/elements/elementsJets.h
 ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/elements/ops.h
 ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/elements/primitive.h
 ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/elements/primitiveEnumJet.inc
diff --git a/C/elements/jets.c b/C/elements/elementsJets.c
similarity index 99%
rename from C/elements/jets.c
rename to C/elements/elementsJets.c
index 0f9596c5..dfdf5be6 100644
--- a/C/elements/jets.c
+++ b/C/elements/elementsJets.c
@@ -1,4 +1,4 @@
-#include "jets.h"
+#include "elementsJets.h"
 
 #include "ops.h"
 #include "txEnv.h"
diff --git a/C/elements/jets.h b/C/elements/elementsJets.h
similarity index 99%
rename from C/elements/jets.h
rename to C/elements/elementsJets.h
index 36a2ea8d..d6412195 100644
--- a/C/elements/jets.h
+++ b/C/elements/elementsJets.h
@@ -1,7 +1,7 @@
 /* This module defines primitives and jets that are specific to the Elements application for Simplicity.
  */
-#ifndef SIMPLICITY_ELEMENTS_JETS_H
-#define SIMPLICITY_ELEMENTS_JETS_H
+#ifndef SIMPLICITY_ELEMENTS_ELEMENTSJETS_H
+#define SIMPLICITY_ELEMENTS_ELEMENTSJETS_H
 
 #include "../jets.h"
 
diff --git a/C/elements/primitive.c b/C/elements/primitive.c
index 15c2174b..72e41e5b 100644
--- a/C/elements/primitive.c
+++ b/C/elements/primitive.c
@@ -1,6 +1,6 @@
 #include "primitive.h"
 
-#include "jets.h"
+#include "elementsJets.h"
 #include "../limitations.h"
 #include "../simplicity_alloc.h"
 #include "../simplicity_assert.h"
diff --git a/Haskell/cbits/elements/jets.c b/Haskell/cbits/elements/jets.c
index a467bf5b..423c64fb 100644
--- a/Haskell/cbits/elements/jets.c
+++ b/Haskell/cbits/elements/jets.c
@@ -1,4 +1,4 @@
-#include "elements/jets.h"
+#include "elements/elementsJets.h"
 #include "../wrappers.h"
 
 WRAP_(version)
diff --git a/Simplicity.cabal b/Simplicity.cabal
index 27c02d96..a90d949e 100644
--- a/Simplicity.cabal
+++ b/Simplicity.cabal
@@ -124,10 +124,10 @@ library Simplicity-Indef
                        vector >=0.12 && <0.14
 
 library
-  C-sources:           C/rsort.c C/elements/jets.c C/elements/ops.c C/elements/env.c C/elements/txEnv.c
+  C-sources:           C/rsort.c C/elements/elementsJets.c C/elements/ops.c C/elements/env.c C/elements/txEnv.c
                        Haskell/cbits/elements/jets.c Haskell/cbits/elements/env.c
   Include-dirs:        C C/include
-  Includes:            elements/jets.h elements/primitive.h simplicity/elements/env.h
+  Includes:            elements/elementsJets.h elements/primitive.h simplicity/elements/env.h
   exposed-modules:     Simplicity.Bitcoin.Programs.Transaction, Simplicity.Bitcoin.Programs.Transaction.Lib,
                        Simplicity.Bitcoin.Programs.TimeLock, Simplicity.Elements.Programs.TimeLock,
                        Simplicity.Elements.Programs.Issuance, Simplicity.Elements.Programs.Issuance.Lib,