diff --git a/src/ipa/libipa/lux.cpp b/src/ipa/libipa/lux.cpp
index 46cc63a115b5..12ba073a1165 100644
--- a/src/ipa/libipa/lux.cpp
+++ b/src/ipa/libipa/lux.cpp
@@ -80,7 +80,7 @@ Lux::Lux()
  * \brief Parse tuning data
  * \param[in] tuningData The ValueNode representing the tuning data
  *
- * This function parses yaml tuning data for the common Lux module. It requires
+ * This function parses tuning data for the common Lux module. It requires
  * reference exposure time, analogue gain, digital gain, and lux values.
  *
  * \code{.unparsed}
diff --git a/src/ipa/libipa/module.cpp b/src/ipa/libipa/module.cpp
index 76e10e250b73..bd415eef59e1 100644
--- a/src/ipa/libipa/module.cpp
+++ b/src/ipa/libipa/module.cpp
@@ -85,14 +85,14 @@ namespace ipa {
 
 /**
  * \fn Module::createAlgorithms()
- * \brief Create algorithms from YAML configuration data
+ * \brief Create algorithms from tuning data
  * \param[in] context The IPA context
  * \param[in] algorithms Algorithms configuration data as a parsed ValueNode
  *
- * This function iterates over the list of \a algorithms parsed from the YAML
- * configuration file, and instantiates and initializes the corresponding
- * algorithms. The configuration data is expected to be correct, any error
- * causes the function to fail and return immediately.
+ * This function iterates over the list of \a algorithms parsed from the tuning
+ * data, and instantiates and initializes the corresponding algorithms. The
+ * configuration data is expected to be correct, any error causes the function
+ * to fail and return immediately.
  *
  * Algorithms can optionally be disabled via the tuning file of the camera
  * module as shown here, with AGC being used as an example:
diff --git a/src/ipa/libipa/module.h b/src/ipa/libipa/module.h
index 3e2408ca30b6..5644458bdf3d 100644
--- a/src/ipa/libipa/module.h
+++ b/src/ipa/libipa/module.h
@@ -50,7 +50,7 @@ public:
 		for (const auto &[i, algo] : utils::enumerate(list)) {
 			if (!algo.isDictionary()) {
 				LOG(IPAModuleAlgo, Error)
-					<< "Invalid YAML syntax for algorithm " << i;
+					<< "Invalid tuning data syntax for algorithm " << i;
 				algorithms_.clear();
 				return -EINVAL;
 			}
diff --git a/src/ipa/libipa/pwl.cpp b/src/ipa/libipa/pwl.cpp
index 9fddd5bf70e2..652569d8577a 100644
--- a/src/ipa/libipa/pwl.cpp
+++ b/src/ipa/libipa/pwl.cpp
@@ -429,7 +429,7 @@ std::string Pwl::toString() const
 
 #ifndef __DOXYGEN__
 /*
- * The YAML data shall be a list of numerical values with an even number of
+ * The value node shall be a list of numerical values with an even number of
  * elements. They are parsed in pairs into x and y points in the piecewise
  * linear function, and added in order. x must be monotonically increasing.
  */
diff --git a/src/ipa/rkisp1/algorithms/dpcc.cpp b/src/ipa/rkisp1/algorithms/dpcc.cpp
index eb8cbf2049c5..20b35d29cbcd 100644
--- a/src/ipa/rkisp1/algorithms/dpcc.cpp
+++ b/src/ipa/rkisp1/algorithms/dpcc.cpp
@@ -74,7 +74,7 @@ int DefectPixelClusterCorrection::init([[maybe_unused]] IPAContext &context,
 		const ValueNode &set = setsObject[i];
 		uint16_t value;
 
-		/* Enable set if described in YAML tuning file. */
+		/* Enable set if described in tuning data. */
 		config_.set_use |= 1 << i;
 
 		/* PG Method */
diff --git a/src/ipa/rkisp1/algorithms/lsc.cpp b/src/ipa/rkisp1/algorithms/lsc.cpp
index a7e3ef8b2eb9..faf88effde01 100644
--- a/src/ipa/rkisp1/algorithms/lsc.cpp
+++ b/src/ipa/rkisp1/algorithms/lsc.cpp
@@ -61,9 +61,9 @@ namespace ipa::rkisp1::algorithms {
  * Due to the optical characteristics of the lens, the light intensity received
  * by the sensor is not uniform.
  *
- * The Lens Shading Correction algorithm applies multipliers to all pixels
- * to compensate for the lens shading effect. The coefficients are
- * specified in a downscaled table in the YAML tuning file.
+ * The Lens Shading Correction algorithm applies multipliers to all pixels to
+ * compensate for the lens shading effect. The coefficients are specified in a
+ * downscaled table in the tuning data.
  */
 
 LOG_DEFINE_CATEGORY(RkISP1Lsc)
diff --git a/src/libcamera/geometry.cpp b/src/libcamera/geometry.cpp
index 010c1d8c35d9..11e57a84d785 100644
--- a/src/libcamera/geometry.cpp
+++ b/src/libcamera/geometry.cpp
@@ -928,7 +928,7 @@ std::ostream &operator<<(std::ostream &out, const Rectangle &r)
 
 #ifndef __DOXYGEN__
 /*
- * The YAML data shall be a list of two numerical values containing the x and y
+ * The value node shall be a list of two numerical values containing the x and y
  * coordinates, in that order.
  */
 template<>
diff --git a/src/libcamera/matrix.cpp b/src/libcamera/matrix.cpp
index e4fb8d35314d..0950408bb838 100644
--- a/src/libcamera/matrix.cpp
+++ b/src/libcamera/matrix.cpp
@@ -310,7 +310,7 @@ template bool matrixInvert<double>(Span<const double> data, Span<double> dataOut
 				   Span<unsigned int> swapBuffer);
 
 /*
- * The YAML data shall be a list of numerical values. Its size shall be equal
+ * The value node shall be a list of numerical values. Its size shall be equal
  * to the product of the number of rows and columns of the matrix (Rows x
  * Cols). The values shall be stored in row-major order.
  */
diff --git a/src/libcamera/vector.cpp b/src/libcamera/vector.cpp
index d850a581e32b..47b3d1af36d9 100644
--- a/src/libcamera/vector.cpp
+++ b/src/libcamera/vector.cpp
@@ -358,7 +358,7 @@ bool vectorValidateValueNode(const ValueNode &obj, unsigned int size)
 
 	if (obj.size() != size) {
 		LOG(Vector, Error)
-			<< "Wrong number of values in YAML vector: expected "
+			<< "Wrong number of values in vector: expected "
 			<< size << ", got " << obj.size();
 		return false;
 	}