diff --git a/lib/oath/Makefile.am b/lib/oath/Makefile.am
index fbd607c..e84f5da 100644
--- a/lib/oath/Makefile.am
+++ b/lib/oath/Makefile.am
@@ -10,7 +10,7 @@ libcryb_oath_la_SOURCES = \
 	cryb_oath_key_dummy.c \
 	cryb_oath_key_from_uri.c \
 	cryb_oath_key_free.c \
-	cryb_oath_key.c \
+	cryb_oath_key_to_uri.c \
 	\
 	cryb_oath.c
 
diff --git a/lib/oath/cryb_oath_key.c b/lib/oath/cryb_oath_key_to_uri.c
similarity index 100%
rename from lib/oath/cryb_oath_key.c
rename to lib/oath/cryb_oath_key_to_uri.c
diff --git a/lib/test/Makefile.am b/lib/test/Makefile.am
index 75214be..a3b6fc8 100644
--- a/lib/test/Makefile.am
+++ b/lib/test/Makefile.am
@@ -2,10 +2,10 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 
 lib_LTLIBRARIES = libcryb-test.la
 libcryb_test_la_SOURCES = \
+	cryb_t_compare.c \
 	cryb_t_const.c \
 	cryb_t_file.c \
 	cryb_t_main.c \
 	cryb_t_malloc.c \
-	cryb_t_util.c \
 	\
 	cryb_test.c
diff --git a/lib/test/cryb_t_util.c b/lib/test/cryb_t_compare.c
similarity index 100%
rename from lib/test/cryb_t_util.c
rename to lib/test/cryb_t_compare.c