diff --git a/Makefile.am b/Makefile.am
index 14fddcca..900ec0fb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -95,10 +95,10 @@ git_sources = \
     src/gitversion.c
 
 otr3_sources = \
-    src/otr/otr3.c src/otr/otr.h
+    src/otr/otrlinv3.c src/otr/otr.h
 
 otr4_sources = \
-    src/otr/otr4.c src/otr/otr.h
+    src/otr/otrlibv4.c src/otr/otr.h
 
 if INCLUDE_GIT_VERSION
 with_git_sources = $(git_sources) $(core_sources)
diff --git a/src/otr/otr3.c b/src/otr/otrlibv3.c
similarity index 100%
rename from src/otr/otr3.c
rename to src/otr/otrlibv3.c
diff --git a/src/otr/otr4.c b/src/otr/otrlibv4.c
similarity index 100%
rename from src/otr/otr4.c
rename to src/otr/otrlibv4.c