diff --git a/TODO.txt b/TODO.txt
index b35213678..bf1437e8e 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -2,6 +2,10 @@
 BEAST TODO
 --------------------------------------------------------------------------------
 
+- Use new file naming convention
+
+- Rename ReadWriteMutex to SharedMutex
+
 - Use SemanticVersion for beast version numbers to replace BEAST_VERSION
 
 - add support for a __PRETTY_FUNCTION__ equivalent for all environments
@@ -23,8 +27,6 @@ BEAST TODO
 
 - Specialize UnsignedInteger<> for peformance in the storage format
 
-- Macro for acquiring a ScopedLock that records file and line.
-
 - Rename HeapBlock routines to not conflict with _CRTDBG_MAP_ALLOC macros
 
 - Design a WeakPtr / SharedPtr / SharedObject intrusive system