Index: api2/src/java/javax/jdo/JDOHelper.java
===================================================================
--- api2/src/java/javax/jdo/JDOHelper.java	(revision 606959)
+++ api2/src/java/javax/jdo/JDOHelper.java	(working copy)
@@ -1051,6 +1051,7 @@
                 // inform the impl that the config came from a jdoconfig.xml
                 // element with the given name
                 properties.put(PROPERTY_NAME, name);
+                properties.remove(PROPERTY_SPI_RESOURCE_NAME);
             }
         }
 
Index: api2-legacy/src/java/javax/jdo/JDOHelper.java
===================================================================
--- api2-legacy/src/java/javax/jdo/JDOHelper.java	(revision 606959)
+++ api2-legacy/src/java/javax/jdo/JDOHelper.java	(working copy)
@@ -976,6 +976,7 @@
                 // inform the impl that the config came from a jdoconfig.xml
                 // element with the given name
                 properties.put(PROPERTY_NAME, name);
+                properties.remove(PROPERTY_SPI_RESOURCE_NAME);
             }
         }