diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java
index 938cabc..49f189b 100644
--- a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java
+++ b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java
@@ -3107,7 +3107,7 @@
                 new R4SearchPolicy(m_policyCore, module));
         // Set the content loader's URL policy.
         contentLoader.setURLPolicy(
-// TODO: FIX - NEED URL POLICY PER MODULE.
+// TODO: ML - SUCKS NEEDING URL POLICY PER MODULE.
                 new URLPolicyImpl(
                     m_logger, m_bundleStreamHandler, module));
 
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/ContentClassLoader.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/ContentClassLoader.java
index d2c5c0c..a41e1ff 100644
--- a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/ContentClassLoader.java
+++ b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/ContentClassLoader.java
@@ -138,7 +138,7 @@
                 // module loader code. Because of this, it is better to
                 // not be holding any locks before making the call.
                 URL url = null;
-// TODO: FIX CODE SOURCE URL
+// TODO: ML - FIX CODE SOURCE URL
 //                URL url = m_mgr.getURLPolicy().createCodeSourceURL(
 //                    m_mgr, m_module);
 
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/URLPolicyImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/URLPolicyImpl.java
index 19cf1cf..f2a69f1 100644
--- a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/URLPolicyImpl.java
+++ b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/URLPolicyImpl.java
@@ -31,7 +31,7 @@
     private IModule m_module = null;
     private static SecureAction m_secureAction = new SecureAction();
 
-// TODO: FIX - IT SUCKS HAVING A URL POLICY OBJECT PER MODULE!
+// TODO: ML - IT SUCKS HAVING A URL POLICY OBJECT PER MODULE!
     public URLPolicyImpl(Logger logger, URLStreamHandler streamHandler, IModule module)
     {
         m_logger = logger;