diff --git a/src/apps/lc-compliance/test_base.cpp b/src/apps/lc-compliance/test_base.cpp
index c9957b9e..3e9ec1aa 100644
--- a/src/apps/lc-compliance/test_base.cpp
+++ b/src/apps/lc-compliance/test_base.cpp
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2021, Collabora Ltd.
  *
- * test_base.cpp - Base definitions for tests
+ * Base definitions for tests
  */
 
 #include "test_base.h"
diff --git a/src/apps/lc-compliance/test_base.h b/src/apps/lc-compliance/test_base.h
index 52347749..0f32e3c2 100644
--- a/src/apps/lc-compliance/test_base.h
+++ b/src/apps/lc-compliance/test_base.h
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2021, Collabora Ltd.
  *
- * test_base.h - Base definitions for tests
+ * Base definitions for tests
  */
 
 #ifndef __LC_COMPLIANCE_TEST_BASE_H__
diff --git a/src/ipa/mali-c55/algorithms/agc.cpp b/src/ipa/mali-c55/algorithms/agc.cpp
index 70667db3..15963994 100644
--- a/src/ipa/mali-c55/algorithms/agc.cpp
+++ b/src/ipa/mali-c55/algorithms/agc.cpp
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2024, Ideas On Board Oy
  *
- * agc.cpp - AGC/AEC mean-based control algorithm
+ * AGC/AEC mean-based control algorithm
  */
 
 #include "agc.h"
diff --git a/src/ipa/mali-c55/algorithms/agc.h b/src/ipa/mali-c55/algorithms/agc.h
index c5c574e5..0b4bf7ed 100644
--- a/src/ipa/mali-c55/algorithms/agc.h
+++ b/src/ipa/mali-c55/algorithms/agc.h
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2023, Ideas on Board Oy
  *
- * agc.h - Mali C55 AGC/AEC mean-based control algorithm
+ * Mali C55 AGC/AEC mean-based control algorithm
  */
 
 #pragma once
diff --git a/src/ipa/mali-c55/algorithms/algorithm.h b/src/ipa/mali-c55/algorithms/algorithm.h
index 36a3bff0..ec8dd397 100644
--- a/src/ipa/mali-c55/algorithms/algorithm.h
+++ b/src/ipa/mali-c55/algorithms/algorithm.h
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2024, Ideas On Board
  *
- * algorithm.h - Mali-C55 control algorithm interface
+ * Mali-C55 control algorithm interface
  */
 
 #pragma once
diff --git a/src/ipa/mali-c55/algorithms/awb.cpp b/src/ipa/mali-c55/algorithms/awb.cpp
index 050b191b..3d546e5a 100644
--- a/src/ipa/mali-c55/algorithms/awb.cpp
+++ b/src/ipa/mali-c55/algorithms/awb.cpp
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2024, Ideas On Board Oy
  *
- * awb.cpp - Mali C55 grey world auto white balance algorithm
+ * Mali C55 grey world auto white balance algorithm
  */
 
 #include "awb.h"
diff --git a/src/ipa/mali-c55/algorithms/awb.h b/src/ipa/mali-c55/algorithms/awb.h
index 800c2e83..2351d405 100644
--- a/src/ipa/mali-c55/algorithms/awb.h
+++ b/src/ipa/mali-c55/algorithms/awb.h
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2024, Ideas on Board Oy
  *
- * awb.h - Mali C55 grey world auto white balance algorithm
+ * Mali C55 grey world auto white balance algorithm
  */
 
 #include "algorithm.h"
diff --git a/src/ipa/mali-c55/algorithms/lsc.cpp b/src/ipa/mali-c55/algorithms/lsc.cpp
index c5afc04d..c43d034a 100644
--- a/src/ipa/mali-c55/algorithms/lsc.cpp
+++ b/src/ipa/mali-c55/algorithms/lsc.cpp
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2024, Ideas On Board Oy
  *
- * lsc.cpp - Mali-C55 Lens shading correction algorithm
+ * Mali-C55 Lens shading correction algorithm
  */
 
 #include "lsc.h"
diff --git a/src/ipa/mali-c55/algorithms/lsc.h b/src/ipa/mali-c55/algorithms/lsc.h
index e613277a..d11e23bc 100644
--- a/src/ipa/mali-c55/algorithms/lsc.h
+++ b/src/ipa/mali-c55/algorithms/lsc.h
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2024, Ideas On Board Oy
  *
- * lsc.h - Mali-C55 Lens shading correction algorithm
+ * Mali-C55 Lens shading correction algorithm
  */
 
 #include <map>
diff --git a/src/ipa/mali-c55/ipa_context.cpp b/src/ipa/mali-c55/ipa_context.cpp
index 99f76ecd..1b203e2b 100644
--- a/src/ipa/mali-c55/ipa_context.cpp
+++ b/src/ipa/mali-c55/ipa_context.cpp
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2024, Ideas On Board
  *
- * ipa_context.cpp - MaliC55 IPA Context
+ * Mali-C55 IPA Context
  */
 
 #include "ipa_context.h"
diff --git a/src/ipa/mali-c55/ipa_context.h b/src/ipa/mali-c55/ipa_context.h
index 5e3e2fbd..13885eb8 100644
--- a/src/ipa/mali-c55/ipa_context.h
+++ b/src/ipa/mali-c55/ipa_context.h
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2024, Ideas On Board
  *
- * ipa_context.h - Mali-C55 IPA Context
+ * Mali-C55 IPA Context
  */
 
 #pragma once
diff --git a/src/ipa/mali-c55/mali-c55.cpp b/src/ipa/mali-c55/mali-c55.cpp
index 5877f299..7d45e731 100644
--- a/src/ipa/mali-c55/mali-c55.cpp
+++ b/src/ipa/mali-c55/mali-c55.cpp
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2023, Ideas on Board Oy
  *
- * mali-c55.cpp - Mali-C55 ISP image processing algorithms
+ * Mali-C55 ISP image processing algorithms
  */
 
 #include <map>
diff --git a/src/ipa/mali-c55/module.h b/src/ipa/mali-c55/module.h
index 1d85ec1f..4f6a4f18 100644
--- a/src/ipa/mali-c55/module.h
+++ b/src/ipa/mali-c55/module.h
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2024, Ideas On Board
  *
- * module.h - Mali-C55 IPA Module
+ * Mali-C55 IPA Module
  */
 
 #pragma once
diff --git a/src/ipa/rkisp1/algorithms/lux.cpp b/src/ipa/rkisp1/algorithms/lux.cpp
index a467767e..dd05f18d 100644
--- a/src/ipa/rkisp1/algorithms/lux.cpp
+++ b/src/ipa/rkisp1/algorithms/lux.cpp
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2024, Ideas On Board
  *
- * lux.cpp - RkISP1 Lux control
+ * RkISP1 Lux control
  */
 
 #include "lux.h"
diff --git a/src/ipa/rkisp1/algorithms/lux.h b/src/ipa/rkisp1/algorithms/lux.h
index 8a90de55..8dcadc28 100644
--- a/src/ipa/rkisp1/algorithms/lux.h
+++ b/src/ipa/rkisp1/algorithms/lux.h
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2024, Ideas On Board
  *
- * lux.h - RkISP1 Lux control
+ * RkISP1 Lux control
  */
 
 #pragma once
diff --git a/src/ipa/rpi/cam_helper/cam_helper_imx283.cpp b/src/ipa/rpi/cam_helper/cam_helper_imx283.cpp
index efc03193..073f3910 100644
--- a/src/ipa/rpi/cam_helper/cam_helper_imx283.cpp
+++ b/src/ipa/rpi/cam_helper/cam_helper_imx283.cpp
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2024, Raspberry Pi Ltd
  *
- * cam_helper_Imx283.cpp - camera information for Imx283 sensor
+ * camera information for Imx283 sensor
  */
 
 #include <assert.h>
diff --git a/src/ipa/rpi/controller/af_algorithm.h b/src/ipa/rpi/controller/af_algorithm.h
index 382609f9..39a8de5a 100644
--- a/src/ipa/rpi/controller/af_algorithm.h
+++ b/src/ipa/rpi/controller/af_algorithm.h
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2022, Raspberry Pi Ltd
  *
- * af_algorithm.hpp - auto focus algorithm interface
+ * Auto focus algorithm interface
  */
 #pragma once
 
diff --git a/src/ipa/rpi/controller/rpi/cac.h b/src/ipa/rpi/controller/rpi/cac.h
index a7b14c00..533cca44 100644
--- a/src/ipa/rpi/controller/rpi/cac.h
+++ b/src/ipa/rpi/controller/rpi/cac.h
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2023, Raspberry Pi Ltd
  *
- * cac.hpp - CAC control algorithm
+ * CAC control algorithm
  */
 #pragma once
 
diff --git a/src/ipa/rpi/controller/rpi/denoise.h b/src/ipa/rpi/controller/rpi/denoise.h
index 92ff4f93..79946c97 100644
--- a/src/ipa/rpi/controller/rpi/denoise.h
+++ b/src/ipa/rpi/controller/rpi/denoise.h
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2022, Raspberry Pi Ltd
  *
- * denoise.hpp - Denoise (spatial, colour, temporal) control algorithm
+ * Denoise (spatial, colour, temporal) control algorithm
  */
 #pragma once
 
diff --git a/src/ipa/rpi/controller/rpi/saturation.h b/src/ipa/rpi/controller/rpi/saturation.h
index 97da412a..c67d496e 100644
--- a/src/ipa/rpi/controller/rpi/saturation.h
+++ b/src/ipa/rpi/controller/rpi/saturation.h
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2022, Raspberry Pi Ltd
  *
- * saturation.hpp - Saturation control algorithm
+ * Saturation control algorithm
  */
 #pragma once
 
diff --git a/src/ipa/rpi/controller/rpi/tonemap.h b/src/ipa/rpi/controller/rpi/tonemap.h
index ba0cf5c4..4e513b1d 100644
--- a/src/ipa/rpi/controller/rpi/tonemap.h
+++ b/src/ipa/rpi/controller/rpi/tonemap.h
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2022, Raspberry Pi Ltd
  *
- * tonemap.hpp - Tonemap control algorithm
+ * Tonemap control algorithm
  */
 #pragma once
 
diff --git a/src/ipa/rpi/pisp/pisp.cpp b/src/ipa/rpi/pisp/pisp.cpp
index ab70d8f4..829b9125 100644
--- a/src/ipa/rpi/pisp/pisp.cpp
+++ b/src/ipa/rpi/pisp/pisp.cpp
@@ -2,8 +2,9 @@
 /*
  * Copyright (C) 2023, Raspberry Pi Ltd
  *
- * pisp.cpp - Raspberry Pi PiSP IPA
+ * Raspberry Pi PiSP IPA
  */
+
 #include <algorithm>
 #include <cmath>
 #include <mutex>
diff --git a/src/libcamera/pipeline/rpi/pisp/pisp.cpp b/src/libcamera/pipeline/rpi/pisp/pisp.cpp
index 15dd9506..082724c5 100644
--- a/src/libcamera/pipeline/rpi/pisp/pisp.cpp
+++ b/src/libcamera/pipeline/rpi/pisp/pisp.cpp
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2023, Raspberry Pi Ltd
  *
- * pisp.cpp - Pipeline handler for PiSP based Raspberry Pi devices
+ * Pipeline handler for PiSP based Raspberry Pi devices
  */
 
 #include <algorithm>
diff --git a/src/libcamera/sensor/camera_sensor_legacy.cpp b/src/libcamera/sensor/camera_sensor_legacy.cpp
index 32989c19..ba0a5c33 100644
--- a/src/libcamera/sensor/camera_sensor_legacy.cpp
+++ b/src/libcamera/sensor/camera_sensor_legacy.cpp
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2019, Google Inc.
  *
- * camera_sensor_legacy.cpp - A V4L2-backed camera sensor
+ * A V4L2-backed camera sensor
  */
 
 #include <algorithm>
diff --git a/src/libcamera/sensor/camera_sensor_raw.cpp b/src/libcamera/sensor/camera_sensor_raw.cpp
index ab75b1f8..f9aef054 100644
--- a/src/libcamera/sensor/camera_sensor_raw.cpp
+++ b/src/libcamera/sensor/camera_sensor_raw.cpp
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2024, Ideas on Board Oy.
  *
- * camera_sensor_raw.cpp - A raw camera sensor using the V4L2 streams API
+ * A raw camera sensor using the V4L2 streams API
  */
 
 #include <algorithm>
diff --git a/test/gstreamer/gstreamer_memory_lifetime_test.cpp b/test/gstreamer/gstreamer_memory_lifetime_test.cpp
index 1738cf56..99d1c4e5 100644
--- a/test/gstreamer/gstreamer_memory_lifetime_test.cpp
+++ b/test/gstreamer/gstreamer_memory_lifetime_test.cpp
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2024, Nicolas Dufresne
  *
- * gstreamer_memory_lifetime_test.cpp - GStreamer memory lifetime test
+ * GStreamer memory lifetime test
  */
 
 #include <iostream>