diff --git a/C/Makefile b/C/Makefile
index 06506b819..2bc9cb60b 100644
--- a/C/Makefile
+++ b/C/Makefile
@@ -1,4 +1,4 @@
-OBJS := bitstream.o cmr.o dag.o deserialize.o eval.o frame.o jets.o jets-secp256k1.o rsort.o sha256.o type.o typeInference.o primitive/elements/env.o primitive/elements/exec.o primitive/elements/ops.o primitive/elements/elementsJets.o primitive/elements/primitive.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 primitive/elements/env.o primitive/elements/exec.o primitive/elements/ops.o primitive/elements/jets.o primitive/elements/primitive.o primitive/elements/cmr.o
 TEST_OBJS := test.o ctx8Pruned.o ctx8Unpruned.o hashBlock.o regression4.o schnorr0.o schnorr6.o typeSkipTest.o primitive/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 $@ $<
 
-primitive/elements/elementsJets.o: primitive/elements/elementsJets.c
+primitive/elements/jets.o: primitive/elements/jets.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 189a04983..9737dc712 100644
--- a/C/elements-sources.mk
+++ b/C/elements-sources.mk
@@ -5,14 +5,13 @@
 ELEMENTS_SIMPLICITY_INCLUDE_DIR_INT = %reldir%/include
 
 ELEMENTS_SIMPLICITY_DIST_HEADERS_INT =
-ELEMENTS_SIMPLICITY_DIST_HEADERS_INT += %reldir%/include/simplicity/cmr.h
 ELEMENTS_SIMPLICITY_DIST_HEADERS_INT += %reldir%/include/simplicity/errorCodes.h
+ELEMENTS_SIMPLICITY_DIST_HEADERS_INT += %reldir%/include/simplicity/elements/cmr.h
 ELEMENTS_SIMPLICITY_DIST_HEADERS_INT += %reldir%/include/simplicity/elements/env.h
 ELEMENTS_SIMPLICITY_DIST_HEADERS_INT += %reldir%/include/simplicity/elements/exec.h
 
 ELEMENTS_SIMPLICITY_LIB_SOURCES_INT =
 ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/bitstream.c
-ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/cmr.c
 ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/dag.c
 ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/deserialize.c
 ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/eval.c
@@ -24,9 +23,10 @@ ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/sha256.c
 ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/type.c
 ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/typeInference.c
 
+ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/primitive/elements/cmr.c
 ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/primitive/elements/env.c
 ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/primitive/elements/exec.c
-ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/primitive/elements/elementsJets.c
+ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/primitive/elements/jets.c
 ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/primitive/elements/ops.c
 ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/primitive/elements/primitive.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%/primitive/elements/decodeElementsJets.inc
-ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/primitive/elements/elementsJets.h
+ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/primitive/elements/jets.h
 ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/primitive/elements/ops.h
 ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/primitive/elements/primitive.h
 ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/primitive/elements/primitiveEnumJet.inc
diff --git a/C/include/simplicity/cmr.h b/C/include/simplicity/elements/cmr.h
similarity index 74%
rename from C/include/simplicity/cmr.h
rename to C/include/simplicity/elements/cmr.h
index 4bde71a28..af3a00779 100644
--- a/C/include/simplicity/cmr.h
+++ b/C/include/simplicity/elements/cmr.h
@@ -1,5 +1,5 @@
-#ifndef SIMPLICITY_CMR_H
-#define SIMPLICITY_CMR_H
+#ifndef SIMPLICITY_ELEMENTS_CMR_H
+#define SIMPLICITY_ELEMENTS_CMR_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -18,6 +18,6 @@
  *               unsigned char cmr[32]
  *               unsigned char program[program_len]
  */
-extern bool simplicity_computeCmr( simplicity_err* error, unsigned char* cmr
-                                 , const unsigned char* program, size_t program_len);
+extern bool simplicity_elements_computeCmr( simplicity_err* error, unsigned char* cmr
+                                          , const unsigned char* program, size_t program_len);
 #endif
diff --git a/C/cmr.c b/C/primitive/elements/cmr.c
similarity index 79%
rename from C/cmr.c
rename to C/primitive/elements/cmr.c
index b4a94fc7d..133484fd3 100644
--- a/C/cmr.c
+++ b/C/primitive/elements/cmr.c
@@ -1,9 +1,9 @@
-#include <simplicity/cmr.h>
+#include <simplicity/elements/cmr.h>
 
-#include "deserialize.h"
-#include "limitations.h"
-#include "simplicity_alloc.h"
-#include "simplicity_assert.h"
+#include "../../deserialize.h"
+#include "../../limitations.h"
+#include "../../simplicity_alloc.h"
+#include "../../simplicity_assert.h"
 
 /* Deserialize a Simplicity 'program' and compute its CMR.
  *
@@ -18,8 +18,8 @@
  *               unsigned char cmr[32]
  *               unsigned char program[program_len]
  */
-bool simplicity_computeCmr( simplicity_err* error, unsigned char* cmr
-                          , const unsigned char* program, size_t program_len) {
+bool simplicity_elements_computeCmr( simplicity_err* error, unsigned char* cmr
+                                   , const unsigned char* program, size_t program_len) {
   simplicity_assert(NULL != error);
   simplicity_assert(NULL != cmr);
   simplicity_assert(NULL != program || 0 == program_len);
diff --git a/C/primitive/elements/elementsJets.c b/C/primitive/elements/jets.c
similarity index 99%
rename from C/primitive/elements/elementsJets.c
rename to C/primitive/elements/jets.c
index e958f2fff..8fb8bd143 100644
--- a/C/primitive/elements/elementsJets.c
+++ b/C/primitive/elements/jets.c
@@ -1,4 +1,4 @@
-#include "elementsJets.h"
+#include "jets.h"
 
 #include "ops.h"
 #include "primitive.h"
diff --git a/C/primitive/elements/elementsJets.h b/C/primitive/elements/jets.h
similarity index 100%
rename from C/primitive/elements/elementsJets.h
rename to C/primitive/elements/jets.h
diff --git a/C/primitive/elements/primitive.c b/C/primitive/elements/primitive.c
index da08b9209..28b6cf501 100644
--- a/C/primitive/elements/primitive.c
+++ b/C/primitive/elements/primitive.c
@@ -2,7 +2,7 @@
  */
 #include "primitive.h"
 
-#include "elementsJets.h"
+#include "jets.h"
 #include "../../limitations.h"
 #include "../../primitive.h"
 #include "../../simplicity_alloc.h"
diff --git a/C/test.c b/C/test.c
index 445b57267..11028fb64 100644
--- a/C/test.c
+++ b/C/test.c
@@ -5,7 +5,7 @@
 #include <time.h>
 #include <getopt.h>
 #include <simplicity/elements/exec.h>
-#include <simplicity/cmr.h>
+#include <simplicity/elements/cmr.h>
 #include "ctx8Pruned.h"
 #include "ctx8Unpruned.h"
 #include "dag.h"
@@ -391,7 +391,7 @@ static void test_elements(void) {
       simplicity_err execResult;
       {
         unsigned char cmrResult[32];
-        if (simplicity_computeCmr(&execResult, cmrResult, elementsCheckSigHashAllTx1, sizeof_elementsCheckSigHashAllTx1) && IS_OK(execResult)) {
+        if (simplicity_elements_computeCmr(&execResult, cmrResult, elementsCheckSigHashAllTx1, sizeof_elementsCheckSigHashAllTx1) && IS_OK(execResult)) {
           if (0 == memcmp(cmrResult, cmr, sizeof(unsigned char[8]))) {
             successes++;
           } else {
@@ -400,7 +400,7 @@ static void test_elements(void) {
           }
         } else {
           failures++;
-          printf("simplicity_computeCmr of elementsCheckSigHashAllTx1 unexpectedly produced %d.\n", execResult);
+          printf("simplicity_elements_computeCmr of elementsCheckSigHashAllTx1 unexpectedly produced %d.\n", execResult);
         }
       }
       {
diff --git a/Haskell/cbits/elements/elementsJets.c b/Haskell/cbits/elements/jets.c
similarity index 98%
rename from Haskell/cbits/elements/elementsJets.c
rename to Haskell/cbits/elements/jets.c
index 4fd6797ec..1b1e7db72 100644
--- a/Haskell/cbits/elements/elementsJets.c
+++ b/Haskell/cbits/elements/jets.c
@@ -1,4 +1,4 @@
-#include "primitive/elements/elementsJets.h"
+#include "primitive/elements/jets.h"
 #include "../wrappers.h"
 
 WRAP_(version)
diff --git a/Simplicity.cabal b/Simplicity.cabal
index 625fbcac6..7b6f4c37e 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/primitive/elements/elementsJets.c C/primitive/elements/ops.c C/primitive/elements/env.c
-                       Haskell/cbits/elements/elementsJets.c Haskell/cbits/elements/env.c
+  C-sources:           C/rsort.c C/primitive/elements/jets.c C/primitive/elements/ops.c C/primitive/elements/env.c
+                       Haskell/cbits/elements/jets.c Haskell/cbits/elements/env.c
   Include-dirs:        C C/include
-  Includes:            primitive/elements/elementsJets.h primitive/elements/primitive.h simplicity/elements/env.h
+  Includes:            primitive/elements/jets.h primitive/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,