diff --git a/cpp/ql/src/Likely Bugs/Memory Management/PointerWrapAround-bad.cpp b/cpp/ql/src/Likely Bugs/Memory Management/PointerOverflow-bad.cpp
similarity index 100%
rename from cpp/ql/src/Likely Bugs/Memory Management/PointerWrapAround-bad.cpp
rename to cpp/ql/src/Likely Bugs/Memory Management/PointerOverflow-bad.cpp
diff --git a/cpp/ql/src/Likely Bugs/Memory Management/PointerWrapAround-good.cpp b/cpp/ql/src/Likely Bugs/Memory Management/PointerOverflow-good.cpp
similarity index 100%
rename from cpp/ql/src/Likely Bugs/Memory Management/PointerWrapAround-good.cpp
rename to cpp/ql/src/Likely Bugs/Memory Management/PointerOverflow-good.cpp
diff --git a/cpp/ql/src/Likely Bugs/Memory Management/PointerWrapAround.qhelp b/cpp/ql/src/Likely Bugs/Memory Management/PointerOverflow.qhelp
similarity index 96%
rename from cpp/ql/src/Likely Bugs/Memory Management/PointerWrapAround.qhelp
rename to cpp/ql/src/Likely Bugs/Memory Management/PointerOverflow.qhelp
index 4924719e6af..7a247025b77 100644
--- a/cpp/ql/src/Likely Bugs/Memory Management/PointerWrapAround.qhelp	
+++ b/cpp/ql/src/Likely Bugs/Memory Management/PointerOverflow.qhelp	
@@ -38,7 +38,7 @@ checking if adding it to <code>ptr</code> creates a pointer so large that it
 overflows and wraps around.
 </p>
 
-<sample src="PointerWrapAround-bad.cpp" />
+<sample src="PointerOverflow-bad.cpp" />
 
 <p>
 In both of these checks, the operations are performed in the wrong order.
@@ -60,7 +60,7 @@ allocation.
 The next example shows how to portably check whether a number is outside the
 range of an allocation between <code>ptr</code> and <code>ptr_end</code>.
 </p>
-<sample src="PointerWrapAround-good.cpp" />
+<sample src="PointerOverflow-good.cpp" />
 </example>
 <references>
 <li><a href="https://blog.regehr.org/archives/1395">Pointer Overflow Checking [Embedded in Academia]</a></li>
diff --git a/cpp/ql/src/Likely Bugs/Memory Management/PointerWrapAround.ql b/cpp/ql/src/Likely Bugs/Memory Management/PointerOverflow.ql
similarity index 82%
rename from cpp/ql/src/Likely Bugs/Memory Management/PointerWrapAround.ql
rename to cpp/ql/src/Likely Bugs/Memory Management/PointerOverflow.ql
index 08b5831bbbb..d787598decc 100644
--- a/cpp/ql/src/Likely Bugs/Memory Management/PointerWrapAround.ql	
+++ b/cpp/ql/src/Likely Bugs/Memory Management/PointerOverflow.ql	
@@ -1,12 +1,11 @@
 /**
- * @name Reliance on pointer wrap-around
- * @description Adding a value to a pointer
- *              to see if it "wraps around" is dangerous because it relies
+ * @name Range check relying on pointer overflow
+ * @description Adding a value to a pointer to see if it overflows relies
  *              on undefined behavior and may lead to memory corruption.
  * @kind problem
  * @problem.severity error
  * @precision high
- * @id cpp/pointer-wrap-around
+ * @id cpp/pointer-overflow
  * @tags reliability
  *       security
  */
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Memory Management/PointerOverflowCheck/PointerWrapAround.expected b/cpp/ql/test/query-tests/Likely Bugs/Memory Management/PointerOverflow/PointerOverflow.expected
similarity index 100%
rename from cpp/ql/test/query-tests/Likely Bugs/Memory Management/PointerOverflowCheck/PointerWrapAround.expected
rename to cpp/ql/test/query-tests/Likely Bugs/Memory Management/PointerOverflow/PointerOverflow.expected
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Memory Management/PointerOverflow/PointerOverflow.qlref b/cpp/ql/test/query-tests/Likely Bugs/Memory Management/PointerOverflow/PointerOverflow.qlref
new file mode 100644
index 00000000000..2cad0c8bd7f
--- /dev/null
+++ b/cpp/ql/test/query-tests/Likely Bugs/Memory Management/PointerOverflow/PointerOverflow.qlref	
@@ -0,0 +1 @@
+Likely Bugs/Memory Management/PointerOverflow.ql
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Memory Management/PointerOverflowCheck/test.cpp b/cpp/ql/test/query-tests/Likely Bugs/Memory Management/PointerOverflow/test.cpp
similarity index 100%
rename from cpp/ql/test/query-tests/Likely Bugs/Memory Management/PointerOverflowCheck/test.cpp
rename to cpp/ql/test/query-tests/Likely Bugs/Memory Management/PointerOverflow/test.cpp
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Memory Management/PointerOverflowCheck/PointerWrapAround.qlref b/cpp/ql/test/query-tests/Likely Bugs/Memory Management/PointerOverflowCheck/PointerWrapAround.qlref
deleted file mode 100644
index 294f81ad693..00000000000
--- a/cpp/ql/test/query-tests/Likely Bugs/Memory Management/PointerOverflowCheck/PointerWrapAround.qlref	
+++ /dev/null
@@ -1 +0,0 @@
-Likely Bugs/Memory Management/PointerWrapAround.ql