diff --git a/include/internal/string_view.h b/include/internal/string_view.h
index f5bcfc5..aa3779c 100644
--- a/include/internal/string_view.h
+++ b/include/internal/string_view.h
@@ -61,7 +61,8 @@ bool CpuFeatures_StringView_StartsWith(const StringView a, const StringView b);
 
 // Removes count characters from the beginning of view or kEmptyStringView if
 // count if greater than view.size.
-StringView CpuFeatures_StringView_PopFront(const StringView view, size_t count);
+StringView CpuFeatures_StringView_PopFront(const StringView str_view,
+                                           size_t count);
 
 // Removes count characters from the end of view or kEmptyStringView if count if
 // greater than view.size.
@@ -70,7 +71,7 @@ StringView CpuFeatures_StringView_PopBack(const StringView str_view,
 
 // Keeps the count first characters of view or view if count if greater than
 // view.size.
-StringView CpuFeatures_StringView_KeepFront(const StringView view,
+StringView CpuFeatures_StringView_KeepFront(const StringView str_view,
                                             size_t count);
 
 // Retrieves the first character of view. If view is empty the behavior is
diff --git a/test/filesystem_for_testing.cc b/test/filesystem_for_testing.cc
index b65d39b..4554c1f 100644
--- a/test/filesystem_for_testing.cc
+++ b/test/filesystem_for_testing.cc
@@ -94,10 +94,10 @@ extern "C" void CpuFeatures_CloseFile(int file_descriptor) {
   kFilesystem->FindFileOrDie(file_descriptor)->Close();
 }
 
-extern "C" int CpuFeatures_ReadFile(int file_descriptor, void* buf,
-                                    size_t count) {
+extern "C" int CpuFeatures_ReadFile(int file_descriptor, void* buffer,
+                                    size_t buffer_size) {
   return kFilesystem->FindFileOrDie(file_descriptor)
-      ->Read(file_descriptor, buf, count);
+      ->Read(file_descriptor, buffer, buffer_size);
 }
 
 }  // namespace cpu_features