diff --git a/src/main/java/gov/nasa/pds/label/jaxb/PDSNamespacePrefixMapper.java b/src/main/java/gov/nasa/pds/label/jaxb/PDSNamespacePrefixMapper.java
index af3cf04b..ebda26f4 100644
--- a/src/main/java/gov/nasa/pds/label/jaxb/PDSNamespacePrefixMapper.java
+++ b/src/main/java/gov/nasa/pds/label/jaxb/PDSNamespacePrefixMapper.java
@@ -37,7 +37,7 @@
 import java.util.Map;
 import java.util.Properties;
 import org.apache.commons.io.IOUtils;
-import com.sun.xml.bind.marshaller.NamespacePrefixMapper;
+import org.glassfish.jaxb.runtime.marshaller.NamespacePrefixMapper;
 
 
 /**
diff --git a/src/main/java/gov/nasa/pds/objectAccess/ObjectAccess.java b/src/main/java/gov/nasa/pds/objectAccess/ObjectAccess.java
index be852abd..00ca09cd 100644
--- a/src/main/java/gov/nasa/pds/objectAccess/ObjectAccess.java
+++ b/src/main/java/gov/nasa/pds/objectAccess/ObjectAccess.java
@@ -42,13 +42,6 @@
 import java.util.Enumeration;
 import java.util.List;
 import java.util.NoSuchElementException;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.ValidationEvent;
-import javax.xml.bind.ValidationEventHandler;
-import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import org.apache.commons.io.FileUtils;
@@ -104,6 +97,13 @@
 import gov.nasa.pds.label.jaxb.PDSXMLEventReader;
 import gov.nasa.pds.label.jaxb.XMLLabelContext;
 import gov.nasa.pds.objectAccess.utility.Utility;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.ValidationEvent;
+import jakarta.xml.bind.ValidationEventHandler;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 /**
  * The <code>ObjectAccess</code> class is a point of entry into parsed PDS (including PDS