diff --git a/bindings/c/test/workloads/SimpleWorkload.cpp b/bindings/c/test/workloads/SimpleWorkload.cpp
index d869845a06..5cf7cf8344 100644
--- a/bindings/c/test/workloads/SimpleWorkload.cpp
+++ b/bindings/c/test/workloads/SimpleWorkload.cpp
@@ -1,5 +1,5 @@
 /*
- * workloads.h
+ * SimpleWorkload.cpp
  *
  * This source file is part of the FoundationDB open source project
  *
diff --git a/bindings/c/test/workloads/workloads.cpp b/bindings/c/test/workloads/workloads.cpp
index 1f01054e84..098f40ef28 100644
--- a/bindings/c/test/workloads/workloads.cpp
+++ b/bindings/c/test/workloads/workloads.cpp
@@ -1,5 +1,5 @@
 /*
- * workloads.h
+ * workloads.cpp
  *
  * This source file is part of the FoundationDB open source project
  *
diff --git a/fdbserver/BackupProgress.actor.h b/fdbserver/BackupProgress.actor.h
index 74f97d4d3d..aec6f8c5b9 100644
--- a/fdbserver/BackupProgress.actor.h
+++ b/fdbserver/BackupProgress.actor.h
@@ -1,5 +1,5 @@
 /*
- * BackupProgress.h
+ * BackupProgress.actor.h
  *
  * This source file is part of the FoundationDB open source project
  *
diff --git a/fdbserver/ProxyCommitData.actor.h b/fdbserver/ProxyCommitData.actor.h
index e4498f407a..75b84e5c38 100644
--- a/fdbserver/ProxyCommitData.actor.h
+++ b/fdbserver/ProxyCommitData.actor.h
@@ -1,5 +1,5 @@
 /*
- * ProxyCommitData.h
+ * ProxyCommitData.actor.h
  *
  * This source file is part of the FoundationDB open source project
  *
diff --git a/fdbserver/RestoreController.actor.h b/fdbserver/RestoreController.actor.h
index 5ff83895f2..1a91eb0b55 100644
--- a/fdbserver/RestoreController.actor.h
+++ b/fdbserver/RestoreController.actor.h
@@ -1,5 +1,5 @@
 /*
- * RestoreController.h
+ * RestoreController.actor.h
  *
  * This source file is part of the FoundationDB open source project
  *
diff --git a/flow/ArgParseUtil.h b/flow/ArgParseUtil.h
index bdb68ba30a..cc54be02d6 100644
--- a/flow/ArgParseUtil.h
+++ b/flow/ArgParseUtil.h
@@ -1,5 +1,5 @@
 /*
- * Arena.h
+ * ArgParseUtil.h
  *
  * This source file is part of the FoundationDB open source project
  *
@@ -37,4 +37,4 @@ Optional<std::string> extractPrefixedArgument(std::string prefix, std::string ar
 	return arg;
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/flow/BooleanParam.h b/flow/BooleanParam.h
index d06faea79a..f6ef5744ce 100644
--- a/flow/BooleanParam.h
+++ b/flow/BooleanParam.h
@@ -1,5 +1,5 @@
 /*
- * Arena.h
+ * BooleanParam.h
  *
  * This source file is part of the FoundationDB open source project
  *
diff --git a/flow/folly_memcpy.h b/flow/folly_memcpy.h
index 7f1b8e443a..e6bdd17946 100644
--- a/flow/folly_memcpy.h
+++ b/flow/folly_memcpy.h
@@ -1,5 +1,5 @@
 /*
- * flow.h
+ * folly_memcpy.h
  *
  * This source file is part of the FoundationDB open source project
  *