diff --git a/libguile/lightning/README.md b/libguile/lightning/README.md
index 90e01bf3f..7eb499435 100644
--- a/libguile/lightning/README.md
+++ b/libguile/lightning/README.md
@@ -6,8 +6,8 @@ Lightning, adapted to the purposes of the GNU Guile project.
 ## Use
 
 ```
-gcc -flto -O2 -g -o jit.o -c jit/jit.c
-gcc -flto -O2 -g -o my-program jit.o my-program.c
+gcc -flto -O2 -g -o lightening.o -c lightening/lightening.c
+gcc -flto -O2 -g -o my-program lightening.o my-program.c
 ```
 
 See the GNU Lightning manual for more on how to program against
diff --git a/libguile/lightning/jit.h b/libguile/lightning/lightening.h
similarity index 97%
rename from libguile/lightning/jit.h
rename to libguile/lightning/lightening.h
index 67e107497..da1d4ec68 100644
--- a/libguile/lightning/jit.h
+++ b/libguile/lightning/lightening.h
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <stddef.h>
 
-#include "jit/endian.h"
+#include "lightening/endian.h"
 
 CHOOSE_32_64(typedef int32_t jit_word_t,
              typedef int64_t jit_word_t);
@@ -74,25 +74,25 @@ typedef struct jit_reloc
 #endif
 
 #if defined(__i386__) || defined(__x86_64__)
-#  include "jit/x86.h"
+#  include "lightening/x86.h"
 #elif defined(__mips__)
-#  include "jit/mips.h"
+#  include "lightening/mips.h"
 #elif defined(__arm__)
-#  include "jit/arm.h"
+#  include "lightening/arm.h"
 #elif defined(__ppc__) || defined(__powerpc__)
-#  include "jit/ppc.h"
+#  include "lightening/ppc.h"
 #elif defined(__sparc__)
-#  include "jit/sparc.h"
+#  include "lightening/sparc.h"
 #elif defined(__ia64__)
-#  include "jit/ia64.h"
+#  include "lightening/ia64.h"
 #elif defined(__hppa__)
-#  include "jit/hppa.h"
+#  include "lightening/hppa.h"
 #elif defined(__aarch64__)
-#  include "jit/aarch64.h"
+#  include "lightening/aarch64.h"
 #elif defined(__s390__) || defined(__s390x__)
-#  include "jit/s390.h"
+#  include "lightening/s390.h"
 #elif defined(__alpha__)
-#  include "jit/alpha.h"
+#  include "lightening/alpha.h"
 #endif
 
 #define JIT_R(index)		JIT_GPR(jit_r(index))
diff --git a/libguile/lightning/jit/aarch64-cpu.c b/libguile/lightning/lightening/aarch64-cpu.c
similarity index 100%
rename from libguile/lightning/jit/aarch64-cpu.c
rename to libguile/lightning/lightening/aarch64-cpu.c
diff --git a/libguile/lightning/jit/aarch64-fpu.c b/libguile/lightning/lightening/aarch64-fpu.c
similarity index 100%
rename from libguile/lightning/jit/aarch64-fpu.c
rename to libguile/lightning/lightening/aarch64-fpu.c
diff --git a/libguile/lightning/jit/aarch64.c b/libguile/lightning/lightening/aarch64.c
similarity index 100%
rename from libguile/lightning/jit/aarch64.c
rename to libguile/lightning/lightening/aarch64.c
diff --git a/libguile/lightning/jit/aarch64.h b/libguile/lightning/lightening/aarch64.h
similarity index 100%
rename from libguile/lightning/jit/aarch64.h
rename to libguile/lightning/lightening/aarch64.h
diff --git a/libguile/lightning/jit/alpha-cpu.c b/libguile/lightning/lightening/alpha-cpu.c
similarity index 100%
rename from libguile/lightning/jit/alpha-cpu.c
rename to libguile/lightning/lightening/alpha-cpu.c
diff --git a/libguile/lightning/jit/alpha-fpu.c b/libguile/lightning/lightening/alpha-fpu.c
similarity index 100%
rename from libguile/lightning/jit/alpha-fpu.c
rename to libguile/lightning/lightening/alpha-fpu.c
diff --git a/libguile/lightning/jit/alpha.c b/libguile/lightning/lightening/alpha.c
similarity index 100%
rename from libguile/lightning/jit/alpha.c
rename to libguile/lightning/lightening/alpha.c
diff --git a/libguile/lightning/jit/alpha.h b/libguile/lightning/lightening/alpha.h
similarity index 100%
rename from libguile/lightning/jit/alpha.h
rename to libguile/lightning/lightening/alpha.h
diff --git a/libguile/lightning/jit/arm-cpu.c b/libguile/lightning/lightening/arm-cpu.c
similarity index 100%
rename from libguile/lightning/jit/arm-cpu.c
rename to libguile/lightning/lightening/arm-cpu.c
diff --git a/libguile/lightning/jit/arm-swf.c b/libguile/lightning/lightening/arm-swf.c
similarity index 100%
rename from libguile/lightning/jit/arm-swf.c
rename to libguile/lightning/lightening/arm-swf.c
diff --git a/libguile/lightning/jit/arm-vfp.c b/libguile/lightning/lightening/arm-vfp.c
similarity index 100%
rename from libguile/lightning/jit/arm-vfp.c
rename to libguile/lightning/lightening/arm-vfp.c
diff --git a/libguile/lightning/jit/arm.c b/libguile/lightning/lightening/arm.c
similarity index 100%
rename from libguile/lightning/jit/arm.c
rename to libguile/lightning/lightening/arm.c
diff --git a/libguile/lightning/jit/arm.h b/libguile/lightning/lightening/arm.h
similarity index 100%
rename from libguile/lightning/jit/arm.h
rename to libguile/lightning/lightening/arm.h
diff --git a/libguile/lightning/jit/endian.h b/libguile/lightning/lightening/endian.h
similarity index 100%
rename from libguile/lightning/jit/endian.h
rename to libguile/lightning/lightening/endian.h
diff --git a/libguile/lightning/jit/hppa-cpu.c b/libguile/lightning/lightening/hppa-cpu.c
similarity index 100%
rename from libguile/lightning/jit/hppa-cpu.c
rename to libguile/lightning/lightening/hppa-cpu.c
diff --git a/libguile/lightning/jit/hppa-fpu.c b/libguile/lightning/lightening/hppa-fpu.c
similarity index 100%
rename from libguile/lightning/jit/hppa-fpu.c
rename to libguile/lightning/lightening/hppa-fpu.c
diff --git a/libguile/lightning/jit/hppa.c b/libguile/lightning/lightening/hppa.c
similarity index 100%
rename from libguile/lightning/jit/hppa.c
rename to libguile/lightning/lightening/hppa.c
diff --git a/libguile/lightning/jit/hppa.h b/libguile/lightning/lightening/hppa.h
similarity index 100%
rename from libguile/lightning/jit/hppa.h
rename to libguile/lightning/lightening/hppa.h
diff --git a/libguile/lightning/jit/ia64-cpu.c b/libguile/lightning/lightening/ia64-cpu.c
similarity index 100%
rename from libguile/lightning/jit/ia64-cpu.c
rename to libguile/lightning/lightening/ia64-cpu.c
diff --git a/libguile/lightning/jit/ia64-fpu.c b/libguile/lightning/lightening/ia64-fpu.c
similarity index 100%
rename from libguile/lightning/jit/ia64-fpu.c
rename to libguile/lightning/lightening/ia64-fpu.c
diff --git a/libguile/lightning/jit/ia64.c b/libguile/lightning/lightening/ia64.c
similarity index 100%
rename from libguile/lightning/jit/ia64.c
rename to libguile/lightning/lightening/ia64.c
diff --git a/libguile/lightning/jit/ia64.h b/libguile/lightning/lightening/ia64.h
similarity index 100%
rename from libguile/lightning/jit/ia64.h
rename to libguile/lightning/lightening/ia64.h
diff --git a/libguile/lightning/jit/jit.c b/libguile/lightning/lightening/lightening.c
similarity index 99%
rename from libguile/lightning/jit/jit.c
rename to libguile/lightning/lightening/lightening.c
index 666b1dfec..afb0b11ee 100644
--- a/libguile/lightning/jit/jit.c
+++ b/libguile/lightning/lightening/lightening.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <sys/mman.h>
 
-#include "../jit.h"
+#include "../lightening.h"
 
 #if defined(__GNUC__)
 # define maybe_unused           __attribute__ ((unused))
diff --git a/libguile/lightning/jit/mips-cpu.c b/libguile/lightning/lightening/mips-cpu.c
similarity index 100%
rename from libguile/lightning/jit/mips-cpu.c
rename to libguile/lightning/lightening/mips-cpu.c
diff --git a/libguile/lightning/jit/mips-fpu.c b/libguile/lightning/lightening/mips-fpu.c
similarity index 100%
rename from libguile/lightning/jit/mips-fpu.c
rename to libguile/lightning/lightening/mips-fpu.c
diff --git a/libguile/lightning/jit/mips.c b/libguile/lightning/lightening/mips.c
similarity index 100%
rename from libguile/lightning/jit/mips.c
rename to libguile/lightning/lightening/mips.c
diff --git a/libguile/lightning/jit/mips.h b/libguile/lightning/lightening/mips.h
similarity index 100%
rename from libguile/lightning/jit/mips.h
rename to libguile/lightning/lightening/mips.h
diff --git a/libguile/lightning/jit/ppc-cpu.c b/libguile/lightning/lightening/ppc-cpu.c
similarity index 100%
rename from libguile/lightning/jit/ppc-cpu.c
rename to libguile/lightning/lightening/ppc-cpu.c
diff --git a/libguile/lightning/jit/ppc-fpu.c b/libguile/lightning/lightening/ppc-fpu.c
similarity index 100%
rename from libguile/lightning/jit/ppc-fpu.c
rename to libguile/lightning/lightening/ppc-fpu.c
diff --git a/libguile/lightning/jit/ppc.c b/libguile/lightning/lightening/ppc.c
similarity index 100%
rename from libguile/lightning/jit/ppc.c
rename to libguile/lightning/lightening/ppc.c
diff --git a/libguile/lightning/jit/ppc.h b/libguile/lightning/lightening/ppc.h
similarity index 100%
rename from libguile/lightning/jit/ppc.h
rename to libguile/lightning/lightening/ppc.h
diff --git a/libguile/lightning/jit/s390-cpu.c b/libguile/lightning/lightening/s390-cpu.c
similarity index 100%
rename from libguile/lightning/jit/s390-cpu.c
rename to libguile/lightning/lightening/s390-cpu.c
diff --git a/libguile/lightning/jit/s390-fpu.c b/libguile/lightning/lightening/s390-fpu.c
similarity index 100%
rename from libguile/lightning/jit/s390-fpu.c
rename to libguile/lightning/lightening/s390-fpu.c
diff --git a/libguile/lightning/jit/s390.c b/libguile/lightning/lightening/s390.c
similarity index 100%
rename from libguile/lightning/jit/s390.c
rename to libguile/lightning/lightening/s390.c
diff --git a/libguile/lightning/jit/s390.h b/libguile/lightning/lightening/s390.h
similarity index 100%
rename from libguile/lightning/jit/s390.h
rename to libguile/lightning/lightening/s390.h
diff --git a/libguile/lightning/jit/sparc-cpu.c b/libguile/lightning/lightening/sparc-cpu.c
similarity index 100%
rename from libguile/lightning/jit/sparc-cpu.c
rename to libguile/lightning/lightening/sparc-cpu.c
diff --git a/libguile/lightning/jit/sparc-fpu.c b/libguile/lightning/lightening/sparc-fpu.c
similarity index 100%
rename from libguile/lightning/jit/sparc-fpu.c
rename to libguile/lightning/lightening/sparc-fpu.c
diff --git a/libguile/lightning/jit/sparc.c b/libguile/lightning/lightening/sparc.c
similarity index 100%
rename from libguile/lightning/jit/sparc.c
rename to libguile/lightning/lightening/sparc.c
diff --git a/libguile/lightning/jit/sparc.h b/libguile/lightning/lightening/sparc.h
similarity index 100%
rename from libguile/lightning/jit/sparc.h
rename to libguile/lightning/lightening/sparc.h
diff --git a/libguile/lightning/jit/x86-cpu.c b/libguile/lightning/lightening/x86-cpu.c
similarity index 100%
rename from libguile/lightning/jit/x86-cpu.c
rename to libguile/lightning/lightening/x86-cpu.c
diff --git a/libguile/lightning/jit/x86-sse.c b/libguile/lightning/lightening/x86-sse.c
similarity index 100%
rename from libguile/lightning/jit/x86-sse.c
rename to libguile/lightning/lightening/x86-sse.c
diff --git a/libguile/lightning/jit/x86-x87.c b/libguile/lightning/lightening/x86-x87.c
similarity index 100%
rename from libguile/lightning/jit/x86-x87.c
rename to libguile/lightning/lightening/x86-x87.c
diff --git a/libguile/lightning/jit/x86.c b/libguile/lightning/lightening/x86.c
similarity index 100%
rename from libguile/lightning/jit/x86.c
rename to libguile/lightning/lightening/x86.c
diff --git a/libguile/lightning/jit/x86.h b/libguile/lightning/lightening/x86.h
similarity index 100%
rename from libguile/lightning/jit/x86.h
rename to libguile/lightning/lightening/x86.h
diff --git a/libguile/lightning/tests/Makefile b/libguile/lightning/tests/Makefile
index d5295ac13..e94c6fdee 100644
--- a/libguile/lightning/tests/Makefile
+++ b/libguile/lightning/tests/Makefile
@@ -13,12 +13,12 @@ check: all
 	done
 	@echo "Success."
 
-jit.o: ../jit.h ../jit/*.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -I.. -o jit.o -c ../jit/jit.c
+lightening.o: ../lightening.h ../lightening/*.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -I.. -o lightening.o -c ../lightening/lightening.c
 
-test-%: %.c jit.o test.h
-	$(CC) $(CFLAGS) $(CPPFLAGS) -I.. -o $@ jit.o $<
+test-%: %.c lightening.o test.h
+	$(CC) $(CFLAGS) $(CPPFLAGS) -I.. -o $@ lightening.o $<
 
 clean:
 	rm -f $(addprefix test-,$(TESTS))
-	rm -f jit.o
+	rm -f lightening.o
diff --git a/libguile/lightning/tests/test.h b/libguile/lightning/tests/test.h
index bc30507ca..d2d7ec72d 100644
--- a/libguile/lightning/tests/test.h
+++ b/libguile/lightning/tests/test.h
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <sys/mman.h>
 
-#include <jit.h>
+#include <lightening.h>
 
 #define ASSERT(x) \
   do {                                                                  \