diff --git a/pdns/dnsdistdist/dnsdist-lua-ffi.cc b/pdns/dnsdistdist/dnsdist-lua-ffi.cc
index deac8dca4fdb..120a99b8cf38 100644
--- a/pdns/dnsdistdist/dnsdist-lua-ffi.cc
+++ b/pdns/dnsdistdist/dnsdist-lua-ffi.cc
@@ -606,7 +606,7 @@ void dnsdist_ffi_dnsquestion_send_trap(dnsdist_ffi_dnsquestion_t* dq, const char
 
 void dnsdist_ffi_dnsquestion_spoof_packet(dnsdist_ffi_dnsquestion_t* dq, const char* raw, size_t len)
 {
-  // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
+  // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-pointer-arithmetic)
   dnsdist::self_answers::generateAnswerFromRawPacket(*dq->dq, PacketBuffer(raw, raw + len));
 }
 
diff --git a/pdns/dnsdistdist/dnsdist-rules-factory.hh b/pdns/dnsdistdist/dnsdist-rules-factory.hh
index 84a6927be481..1f5a8bba4f99 100644
--- a/pdns/dnsdistdist/dnsdist-rules-factory.hh
+++ b/pdns/dnsdistdist/dnsdist-rules-factory.hh
@@ -561,7 +561,7 @@ class HTTPHeaderRule : public DNSRule
 {
 public:
   HTTPHeaderRule(const std::string& header, const std::string& regex);
-  bool matches(const DNSQuestion* dq) const override;
+  bool matches(const DNSQuestion* dnsQuestion) const override;
   string toString() const override;
 
 private:
@@ -574,7 +574,7 @@ class HTTPPathRule : public DNSRule
 {
 public:
   HTTPPathRule(std::string path);
-  bool matches(const DNSQuestion* dq) const override;
+  bool matches(const DNSQuestion* dnsQuestion) const override;
   string toString() const override;
 
 private:
@@ -585,7 +585,7 @@ class HTTPPathRegexRule : public DNSRule
 {
 public:
   HTTPPathRegexRule(const std::string& regex);
-  bool matches(const DNSQuestion* dq) const override;
+  bool matches(const DNSQuestion* dnsQuestion) const override;
   string toString() const override;
 
 private:
diff --git a/pdns/dnsdistdist/dnsdist.cc b/pdns/dnsdistdist/dnsdist.cc
index 2c6421f63d61..87fb0db2acba 100644
--- a/pdns/dnsdistdist/dnsdist.cc
+++ b/pdns/dnsdistdist/dnsdist.cc
@@ -871,7 +871,7 @@ static void spoofResponseFromString(DNSQuestion& dnsQuestion, const string& spoo
 
 static void spoofPacketFromString(DNSQuestion& dnsQuestion, const string& spoofContent)
 {
-  // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
+  // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-pointer-arithmetic)
   dnsdist::self_answers::generateAnswerFromRawPacket(dnsQuestion, PacketBuffer(spoofContent.data(), spoofContent.data() + spoofContent.size()));
 }