Index: src/com/iver/cit/gvsig/project/documents/view/toc/gui/FPopupMenu.java
===================================================================
--- src/com/iver/cit/gvsig/project/documents/view/toc/gui/FPopupMenu.java	(revision 37875)
+++ src/com/iver/cit/gvsig/project/documents/view/toc/gui/FPopupMenu.java	(working copy)
@@ -126,7 +126,7 @@
 
     	OldTocContextMenuAction action = new OldTocContextMenuAction();
     	action.setEntry(entry);
-    	
+    	System.out.println("Add old TocMenuEntry: " + entry);
     	TOCManager tm = TOCLocator.getInstance().getTOCManager();
 		tm.addServiceFactory(action);
     }
@@ -296,6 +296,10 @@
 			if (!action.isVisible() ||
 					(action instanceof TOCActionAdapter &&
 							((TOCActionAdapter) action).getContextMenuAction() instanceof OldTocContextMenuAction)) {
+				if (((action instanceof TOCActionAdapter) && ((TOCActionAdapter) action).getContextMenuAction() instanceof OldTocContextMenuAction)) {
+					OldTocContextMenuAction oldAct = (OldTocContextMenuAction) ((TOCActionAdapter) action).getContextMenuAction();
+					oldAct.getEntry().initialize(this);
+				}
 				continue;
 			}
 			
Index: src/org/gvsig/fmap/swing/impl/toc/DefaultTOCManager.java
===================================================================
--- src/org/gvsig/fmap/swing/impl/toc/DefaultTOCManager.java	(revision 37875)
+++ src/org/gvsig/fmap/swing/impl/toc/DefaultTOCManager.java	(working copy)
@@ -27,6 +27,7 @@
 
 import com.iver.cit.gvsig.fmap.MapContext;
 import com.iver.cit.gvsig.project.documents.IContextMenuAction;
+import com.iver.cit.gvsig.project.documents.view.toc.actions.OldTocContextMenuAction;
 import com.iver.utiles.extensionPoints.ExtensionPointsSingleton;
 
 import org.gvsig.fmap.swing.toc.TOC;
@@ -77,6 +78,9 @@
 
     public void addServiceFactory(IContextMenuAction icma) {
         TOCActionFactoryAdapter ada = new TOCActionFactoryAdapter(icma);
+        if (icma instanceof OldTocContextMenuAction) {
+        	ada.setName(((OldTocContextMenuAction) icma).getEntry().getClass().toString()); 
+        }
         addServiceFactory(ada);
     }
 
Index: src/org/gvsig/fmap/swing/toc/action/TOCActionFactoryAdapter.java
===================================================================
--- src/org/gvsig/fmap/swing/toc/action/TOCActionFactoryAdapter.java	(revision 37875)
+++ src/org/gvsig/fmap/swing/toc/action/TOCActionFactoryAdapter.java	(working copy)
@@ -40,6 +40,7 @@
 public class TOCActionFactoryAdapter implements TOCActionFactory {
 
     private IContextMenuAction icma = null;
+    private String name = null;
 
     public static final String DYN_CLASS_NAME =
         TOCActionFactoryAdapter.class.getName() + "_DynClass";
@@ -71,9 +72,20 @@
     }
 
     public String getName() {
-        return icma.getClass().getName() + "_TOCActionFactoryAdapter";
+    	if (name == null) {
+    		name = icma.getClass().getName() + "_TOCActionFactoryAdapter";
+    	}
+        return name;
     }
-
+    
+    /**
+     * Useful to register OldTocMenuEntry wrappers.
+     * @param name
+     */
+    public void setName(String name) {
+    	this.name = name + "_TOCActionFactoryAdapter";
+    }
+ 
     public void initialize() {
     }