Index: trunk/ippToPsps/jython/datastore.py
===================================================================
--- trunk/ippToPsps/jython/datastore.py	(revision 32119)
+++ trunk/ippToPsps/jython/datastore.py	(revision 32120)
@@ -6,5 +6,4 @@
 import sys
 from xml.etree.ElementTree import ElementTree, Element, tostring
-
 
 '''
@@ -94,3 +93,5 @@
         for i in range(firstInt, lastInt):
             
-            self.remove("B%08d" % i)
+            self.remove(Batch.getNameFromID(i))
+
+from batch import Batch
Index: trunk/ippToPsps/jython/odm.py
===================================================================
--- trunk/ippToPsps/jython/odm.py	(revision 32119)
+++ trunk/ippToPsps/jython/odm.py	(revision 32120)
@@ -6,4 +6,6 @@
 from xml.etree.ElementTree import ElementTree, Element, tostring
 from subprocess import call, PIPE, Popen
+
+from batch import Batch
 
 '''
@@ -25,5 +27,5 @@
     def checkBatch(self, batchID, results):
 
-        batch = "B%08d" % batchID
+        batch = Batch.getNameFromID(batchID)
 
         tempFile = tempfile.NamedTemporaryFile(mode='w+b')