diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj b/builds/msvc/vs2010/libsodium/libsodium.vcxproj
index 6ec3b0c6..e36a02df 100644
--- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj
@@ -109,7 +109,7 @@
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\montgomery.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\pow225521.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\scalarmult_curve25519.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\chacha20\ref\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\chacha20\ref\stream_chacha20_ref.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_aead_aes256gcm.h" />
@@ -348,4 +348,4 @@
     <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
index 5e959902..2eb70981 100644
--- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
@@ -679,7 +679,7 @@
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\pow225521.h">
       <Filter>src\crypto_scalarmult\curve25519\ref10</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\chacha20\ref\api.h">
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\chacha20\ref\stream_chacha20_ref.h">
       <Filter>src\crypto_stream\chacha20\ref</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_chacha20.h">
@@ -1067,4 +1067,4 @@
       <Filter>src\crypto_onetimeauth\poly1305\donna</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj b/builds/msvc/vs2012/libsodium/libsodium.vcxproj
index 5168733a..763c0835 100644
--- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj
@@ -110,7 +110,7 @@
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\montgomery.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\pow225521.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\scalarmult_curve25519.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\chacha20\ref\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\chacha20\ref\stream_chacha20_ref.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_aead_aes256gcm.h" />
@@ -349,4 +349,4 @@
     <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
index 3601e714..28e6e768 100644
--- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
@@ -682,7 +682,7 @@
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\pow225521.h">
       <Filter>src\crypto_scalarmult\curve25519\ref10</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\chacha20\ref\api.h">
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\chacha20\ref\stream_chacha20_ref.h">
       <Filter>src\crypto_stream\chacha20\ref</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_chacha20.h">
@@ -1070,4 +1070,4 @@
       <Filter>src\crypto_sign\ed25519\ref10</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj
index 80163eb6..080fcb4c 100644
--- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj
@@ -109,7 +109,7 @@
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\montgomery.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\pow225521.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\scalarmult_curve25519.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\chacha20\ref\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\chacha20\ref\stream_chacha20_ref.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_aead_aes256gcm.h" />
@@ -348,4 +348,4 @@
     <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters
index 1a7e45f4..3e940ba0 100644
--- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters
@@ -679,7 +679,7 @@
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\pow225521.h">
       <Filter>src\crypto_scalarmult\curve25519\ref10</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\chacha20\ref\api.h">
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\chacha20\ref\stream_chacha20_ref.h">
       <Filter>src\crypto_stream\chacha20\ref</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_chacha20.h">
@@ -1067,4 +1067,4 @@
       <Filter>src\crypto_scalarmult\curve25519</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2015/libsodium/libsodium.vcxproj b/builds/msvc/vs2015/libsodium/libsodium.vcxproj
index 1b599f54..5ef697db 100644
--- a/builds/msvc/vs2015/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2015/libsodium/libsodium.vcxproj
@@ -103,7 +103,7 @@
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\fe.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\montgomery.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\pow225521.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\chacha20\ref\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\chacha20\ref\stream_chacha20_ref.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_aead_aes256gcm.h" />
@@ -355,4 +355,4 @@
     <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters
index e1ffb80f..23d35111 100644
--- a/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters
@@ -727,7 +727,7 @@
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\pow225521.h">
       <Filter>src\crypto_scalarmult\curve25519\ref10</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\chacha20\ref\api.h">
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\chacha20\ref\stream_chacha20_ref.h">
       <Filter>src\crypto_stream\chacha20\ref</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_chacha20.h">
@@ -1094,4 +1094,4 @@
       <Filter>src\crypto_generichash\blake2\ref</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am
index d8beed58..d2be0d8a 100644
--- a/src/libsodium/Makefile.am
+++ b/src/libsodium/Makefile.am
@@ -123,7 +123,7 @@ libsodium_la_SOURCES = \
 	crypto_sign/ed25519/ref10/sqrtm1.h \
 	crypto_stream/crypto_stream.c \
 	crypto_stream/chacha20/stream_chacha20_api.c \
-	crypto_stream/chacha20/ref/api.h \
+	crypto_stream/chacha20/ref/stream_chacha20_ref.h \
 	crypto_stream/chacha20/ref/stream_chacha20_ref.c \
 	crypto_stream/salsa20/stream_salsa20_api.c \
 	crypto_stream/xsalsa20/stream_xsalsa20_api.c \
diff --git a/src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.c b/src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.c
index e5ca1c95..848fdf73 100644
--- a/src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.c
+++ b/src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.c
@@ -9,8 +9,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "api.h"
 #include "crypto_stream_chacha20.h"
+#include "stream_chacha20_ref.h"
 #include "utils.h"
 
 struct chacha_ctx {
diff --git a/src/libsodium/crypto_stream/chacha20/ref/api.h b/src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.h
similarity index 100%
rename from src/libsodium/crypto_stream/chacha20/ref/api.h
rename to src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.h
diff --git a/src/libsodium/crypto_stream/chacha20/stream_chacha20_api.c b/src/libsodium/crypto_stream/chacha20/stream_chacha20_api.c
index 14c51ca1..2d0a0669 100644
--- a/src/libsodium/crypto_stream/chacha20/stream_chacha20_api.c
+++ b/src/libsodium/crypto_stream/chacha20/stream_chacha20_api.c
@@ -1,5 +1,5 @@
 #include "crypto_stream_chacha20.h"
-#include "ref/api.h"
+#include "ref/stream_chacha20_ref.h"
 
 size_t
 crypto_stream_chacha20_keybytes(void) {