diff --git a/Makefile b/Makefile
index 8682093..cd9ab62 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 CXXFLAGS = -std=c++14 -I.
 LDFLAGS = -lm
 
-gen_ft8: gen_ft8.o ft8/encode.o ft8/pack.o ft8/text.o ft8/pack_77.o ft8/encode_91.o common/wave.o
+gen_ft8: gen_ft8.o ft8/encode.o ft8/pack.o ft8/text.o ft8/pack_v2.o ft8/encode_v2.o common/wave.o
 	$(CXX) $(LDFLAGS) -o $@ $^
 
 .PHONY: run_tests
@@ -9,6 +9,5 @@ gen_ft8: gen_ft8.o ft8/encode.o ft8/pack.o ft8/text.o ft8/pack_77.o ft8/encode_9
 run_tests: test
 	@./test
 
-test:  test.o ft8/encode.o ft8/pack.o ft8/text.o ft8/pack_77.o ft8/encode_91.o ft8/unpack.o
+test:  test.o ft8/encode.o ft8/pack.o ft8/text.o ft8/pack_v2.o ft8/encode_v2.o ft8/unpack.o
 	$(CXX) $(LDFLAGS) -o $@ $^
-
diff --git a/ft8/encode_91.cpp b/ft8/encode_v2.cpp
similarity index 99%
rename from ft8/encode_91.cpp
rename to ft8/encode_v2.cpp
index 3769180..f1402d5 100644
--- a/ft8/encode_91.cpp
+++ b/ft8/encode_v2.cpp
@@ -1,4 +1,4 @@
-#include "encode.h"
+#include "encode_v2.h"
 
 #include <stdio.h>
 
diff --git a/ft8/encode_91.h b/ft8/encode_v2.h
similarity index 100%
rename from ft8/encode_91.h
rename to ft8/encode_v2.h
diff --git a/ft8/pack_77.cpp b/ft8/pack_v2.cpp
similarity index 99%
rename from ft8/pack_77.cpp
rename to ft8/pack_v2.cpp
index 8044355..1db6d98 100644
--- a/ft8/pack_77.cpp
+++ b/ft8/pack_v2.cpp
@@ -1,8 +1,9 @@
-#include <string.h>
-#include <stdint.h>
+#include "pack_v2.h"
 
 #include "text.h"
 
+#include <stdint.h>
+#include <string.h>
 #include <stdio.h>
 
 namespace ft8_v2 {
diff --git a/ft8/pack_77.h b/ft8/pack_v2.h
similarity index 100%
rename from ft8/pack_77.h
rename to ft8/pack_v2.h
diff --git a/gen_ft8.cpp b/gen_ft8.cpp
index 01741a1..85bc7f3 100644
--- a/gen_ft8.cpp
+++ b/gen_ft8.cpp
@@ -6,8 +6,8 @@
 #include "common/wave.h"
 #include "ft8/pack.h"
 #include "ft8/encode.h"
-#include "ft8/pack_77.h"
-#include "ft8/encode_91.h"
+#include "ft8/pack_v2.h"
+#include "ft8/encode_v2.h"
 
 
 // Convert a sequence of symbols (tones) into a sinewave of continuous phase (FSK).
diff --git a/test.cpp b/test.cpp
index 0a32a99..03e99aa 100644
--- a/test.cpp
+++ b/test.cpp
@@ -5,9 +5,9 @@
 
 #include "ft8/text.h"
 #include "ft8/pack.h"
-#include "ft8/pack_77.h"
+#include "ft8/pack_v2.h"
 #include "ft8/encode.h"
-#include "ft8/encode_91.h"
+#include "ft8/encode_v2.h"
 #include "ft8/unpack.h"
 
 #include "common/debug.h"