diff --git a/cpp/ql/src/Likely Bugs/Memory Management/Buffer Overflow/BufferAccess.qll b/cpp/ql/src/Likely Bugs/Memory Management/BufferAccess.qll
similarity index 100%
rename from cpp/ql/src/Likely Bugs/Memory Management/Buffer Overflow/BufferAccess.qll
rename to cpp/ql/src/Likely Bugs/Memory Management/BufferAccess.qll
diff --git a/cpp/ql/src/Likely Bugs/Memory Management/Buffer Overflow/NtohlArrayBad.cpp b/cpp/ql/src/Likely Bugs/Memory Management/NtohlArrayBad.cpp
similarity index 100%
rename from cpp/ql/src/Likely Bugs/Memory Management/Buffer Overflow/NtohlArrayBad.cpp
rename to cpp/ql/src/Likely Bugs/Memory Management/NtohlArrayBad.cpp
diff --git a/cpp/ql/src/Likely Bugs/Memory Management/Buffer Overflow/NtohlArrayGood.cpp b/cpp/ql/src/Likely Bugs/Memory Management/NtohlArrayGood.cpp
similarity index 100%
rename from cpp/ql/src/Likely Bugs/Memory Management/Buffer Overflow/NtohlArrayGood.cpp
rename to cpp/ql/src/Likely Bugs/Memory Management/NtohlArrayGood.cpp
diff --git a/cpp/ql/src/Likely Bugs/Memory Management/Buffer Overflow/NtohlArrayNoBound.qhelp b/cpp/ql/src/Likely Bugs/Memory Management/NtohlArrayNoBound.qhelp
similarity index 100%
rename from cpp/ql/src/Likely Bugs/Memory Management/Buffer Overflow/NtohlArrayNoBound.qhelp
rename to cpp/ql/src/Likely Bugs/Memory Management/NtohlArrayNoBound.qhelp
diff --git a/cpp/ql/src/Likely Bugs/Memory Management/Buffer Overflow/NtohlArrayNoBound.ql b/cpp/ql/src/Likely Bugs/Memory Management/NtohlArrayNoBound.ql
similarity index 100%
rename from cpp/ql/src/Likely Bugs/Memory Management/Buffer Overflow/NtohlArrayNoBound.ql
rename to cpp/ql/src/Likely Bugs/Memory Management/NtohlArrayNoBound.ql
diff --git a/cpp/ql/src/Likely Bugs/Memory Management/Buffer Overflow/NtohlArrayNoBound.qll b/cpp/ql/src/Likely Bugs/Memory Management/NtohlArrayNoBound.qll
similarity index 100%
rename from cpp/ql/src/Likely Bugs/Memory Management/Buffer Overflow/NtohlArrayNoBound.qll
rename to cpp/ql/src/Likely Bugs/Memory Management/NtohlArrayNoBound.qll
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Memory Management/Buffer Overflow/NtohlArrayNoBound/NtohlArrayNoBound.qlref b/cpp/ql/test/query-tests/Likely Bugs/Memory Management/Buffer Overflow/NtohlArrayNoBound/NtohlArrayNoBound.qlref
index e8963e65a10..58e62b13e6d 100644
--- a/cpp/ql/test/query-tests/Likely Bugs/Memory Management/Buffer Overflow/NtohlArrayNoBound/NtohlArrayNoBound.qlref	
+++ b/cpp/ql/test/query-tests/Likely Bugs/Memory Management/Buffer Overflow/NtohlArrayNoBound/NtohlArrayNoBound.qlref	
@@ -1 +1 @@
-Likely Bugs/Memory Management/Buffer Overflow/NtohlArrayNoBound.ql
\ No newline at end of file
+Likely Bugs/Memory Management/NtohlArrayNoBound.ql
\ No newline at end of file