diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/entity/Device.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/entity/Device.java
index b57061ad..f21c9953 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/entity/Device.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/entity/Device.java
@@ -2,6 +2,7 @@ package hirs.attestationca.entity;
 
 import hirs.data.persist.AbstractEntity;
 import hirs.data.persist.AppraisalStatus;
+import hirs.data.persist.DeviceInfoReport;
 import hirs.data.persist.enums.HealthStatus;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import hirs.foss.XMLCleaner;
diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/entity/certificate/attributes/PlatformProperty.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/entity/certificate/attributes/PlatformProperty.java
index 3e647986..404bb1d5 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/entity/certificate/attributes/PlatformProperty.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/entity/certificate/attributes/PlatformProperty.java
@@ -1,6 +1,6 @@
 package hirs.attestationca.entity.certificate.attributes;
 
-import hirs.attestationca.entity.DeviceInfoReport;
+import hirs.data.persist.DeviceInfoReport;
 import org.bouncycastle.asn1.ASN1Sequence;
 import org.bouncycastle.asn1.ASN1UTF8String;
 
diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/entity/certificate/attributes/V2/CertificateIdentifier.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/entity/certificate/attributes/V2/CertificateIdentifier.java
index dcf6a9c4..34548a9f 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/entity/certificate/attributes/V2/CertificateIdentifier.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/entity/certificate/attributes/V2/CertificateIdentifier.java
@@ -1,6 +1,6 @@
 package hirs.attestationca.entity.certificate.attributes.V2;
 
-import hirs.attestationca.entity.DeviceInfoReport;
+import hirs.data.persist.DeviceInfoReport;
 import java.math.BigInteger;
 
 import org.bouncycastle.asn1.ASN1Integer;
diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/service/DeviceRegister.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/service/DeviceRegister.java
index e39b87bd..c40cdca0 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/service/DeviceRegister.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/service/DeviceRegister.java
@@ -2,7 +2,7 @@ package hirs.attestationca.service;
 
 
 import hirs.attestationca.entity.Device;
-import hirs.attestationca.entity.DeviceInfoReport;
+import hirs.data.persist.DeviceInfoReport;
 
 /**
  * Interface defining methods for registering a device with the system.
diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/service/DeviceRegisterImpl.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/service/DeviceRegisterImpl.java
index f0aa6484..95af896f 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/service/DeviceRegisterImpl.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/service/DeviceRegisterImpl.java
@@ -1,7 +1,7 @@
 package hirs.attestationca.service;
 
 import hirs.attestationca.entity.Device;
-import hirs.attestationca.entity.DeviceInfoReport;
+import hirs.data.persist.DeviceInfoReport;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/HIRS_AttestationCA/src/test/java/hirs/attestationca/data/persist/DeviceInfoReportTest.java b/HIRS_AttestationCA/src/test/java/hirs/attestationca/data/persist/DeviceInfoReportTest.java
index 7692f075..ac7a9cd6 100644
--- a/HIRS_AttestationCA/src/test/java/hirs/attestationca/data/persist/DeviceInfoReportTest.java
+++ b/HIRS_AttestationCA/src/test/java/hirs/attestationca/data/persist/DeviceInfoReportTest.java
@@ -2,7 +2,7 @@ package hirs.attestationca.data.persist;
 
 import hirs.attestationca.persist.SpringPersistenceTest;
 import hirs.attestationca.servicemanager.DBReportManager;
-import hirs.attestationca.entity.DeviceInfoReport;
+import hirs.data.persist.DeviceInfoReport;
 import hirs.data.persist.info.FirmwareInfo;
 import hirs.data.persist.info.HardwareInfo;
 import hirs.data.persist.info.NetworkInfo;
diff --git a/HIRS_AttestationCA/src/test/java/hirs/attestationca/data/persist/DeviceTest.java b/HIRS_AttestationCA/src/test/java/hirs/attestationca/data/persist/DeviceTest.java
index 793bfa9c..d6234cc5 100644
--- a/HIRS_AttestationCA/src/test/java/hirs/attestationca/data/persist/DeviceTest.java
+++ b/HIRS_AttestationCA/src/test/java/hirs/attestationca/data/persist/DeviceTest.java
@@ -2,7 +2,7 @@ package hirs.attestationca.data.persist;
 
 import hirs.data.persist.AppraisalStatus;
 import hirs.attestationca.entity.Device;
-import hirs.attestationca.entity.DeviceInfoReport;
+import hirs.data.persist.DeviceInfoReport;
 import hirs.data.persist.enums.HealthStatus;
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/DBDeviceGroupManagerTest.java b/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/DBDeviceGroupManagerTest.java
index 32f85d8d..e61fe753 100644
--- a/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/DBDeviceGroupManagerTest.java
+++ b/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/DBDeviceGroupManagerTest.java
@@ -3,7 +3,7 @@ package hirs.attestationca.persist;
 import hirs.appraiser.Appraiser;
 import hirs.attestationca.servicemanager.DBDeviceManager;
 import hirs.attestationca.entity.Device;
-import hirs.attestationca.entity.DeviceInfoReport;
+import hirs.data.persist.DeviceInfoReport;
 import hirs.data.persist.policy.Policy;
 import hirs.persist.DBUtility;
 import hirs.persist.PolicyMapper;
diff --git a/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/DBDeviceManagerTest.java b/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/DBDeviceManagerTest.java
index 4c7d61a6..736301e2 100644
--- a/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/DBDeviceManagerTest.java
+++ b/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/DBDeviceManagerTest.java
@@ -3,7 +3,7 @@ package hirs.attestationca.persist;
 import hirs.attestationca.data.persist.DeviceTest;
 import hirs.attestationca.servicemanager.DBDeviceManager;
 import hirs.attestationca.entity.Device;
-import hirs.attestationca.entity.DeviceInfoReport;
+import hirs.data.persist.DeviceInfoReport;
 import hirs.data.persist.enums.HealthStatus;
 import hirs.data.persist.info.NetworkInfo;
 import hirs.persist.DBUtility;
diff --git a/HIRS_AttestationCA/src/test/java/hirs/attestationca/service/SupplyChainValidationServiceImplTest.java b/HIRS_AttestationCA/src/test/java/hirs/attestationca/service/SupplyChainValidationServiceImplTest.java
index 31621729..701f895a 100644
--- a/HIRS_AttestationCA/src/test/java/hirs/attestationca/service/SupplyChainValidationServiceImplTest.java
+++ b/HIRS_AttestationCA/src/test/java/hirs/attestationca/service/SupplyChainValidationServiceImplTest.java
@@ -6,7 +6,7 @@ import hirs.attestationca.servicemanager.DBDeviceManager;
 import hirs.attestationca.validation.SupplyChainValidationServiceImpl;
 import hirs.data.persist.AppraisalStatus;
 import hirs.attestationca.entity.Device;
-import hirs.attestationca.entity.DeviceInfoReport;
+import hirs.data.persist.DeviceInfoReport;
 import hirs.attestationca.entity.SupplyChainValidation;
 import hirs.attestationca.entity.SupplyChainValidationSummary;
 import hirs.attestationca.entity.certificate.Certificate;
diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/AbstractAttestationCertificateAuthority.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/AbstractAttestationCertificateAuthority.java
index c13aafad..c93834dd 100644
--- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/AbstractAttestationCertificateAuthority.java
+++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/AbstractAttestationCertificateAuthority.java
@@ -8,7 +8,7 @@ import hirs.attestationca.IssuedCertificateAttributeHelper;
 import hirs.attestationca.configuration.provisionerTpm2.ProvisionerTpm2;
 import hirs.attestationca.entity.BaseReferenceManifest;
 import hirs.attestationca.entity.Device;
-import hirs.attestationca.entity.DeviceInfoReport;
+import hirs.data.persist.DeviceInfoReport;
 import hirs.attestationca.entity.EventLogMeasurements;
 import hirs.attestationca.entity.ReferenceDigestValue;
 import hirs.attestationca.entity.ReferenceManifest;
diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/validation/CredentialValidator.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/validation/CredentialValidator.java
index 46121f5a..08d1967d 100644
--- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/validation/CredentialValidator.java
+++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/validation/CredentialValidator.java
@@ -1,6 +1,6 @@
 package hirs.attestationca.portal.validation;
 
-import hirs.attestationca.entity.DeviceInfoReport;
+import hirs.data.persist.DeviceInfoReport;
 import hirs.attestationca.entity.SupplyChainValidation;
 import hirs.attestationca.entity.certificate.EndorsementCredential;
 import hirs.attestationca.entity.certificate.PlatformCredential;
diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/validation/SupplyChainCredentialValidator.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/validation/SupplyChainCredentialValidator.java
index f240db95..7efd23d4 100644
--- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/validation/SupplyChainCredentialValidator.java
+++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/validation/SupplyChainCredentialValidator.java
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import hirs.data.persist.AppraisalStatus;
 import hirs.data.persist.ArchivableEntity;
-import hirs.attestationca.entity.DeviceInfoReport;
+import hirs.data.persist.DeviceInfoReport;
 import hirs.data.persist.SupplyChainValidation;
 import hirs.data.persist.certificate.EndorsementCredential;
 import hirs.data.persist.certificate.PlatformCredential;
diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/validation/SupplyChainValidationServiceImpl.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/validation/SupplyChainValidationServiceImpl.java
index 6aeff378..99675153 100644
--- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/validation/SupplyChainValidationServiceImpl.java
+++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/validation/SupplyChainValidationServiceImpl.java
@@ -7,7 +7,7 @@ import hirs.data.persist.AppraisalStatus;
 import hirs.data.persist.ArchivableEntity;
 import hirs.attestationca.entity.BaseReferenceManifest;
 import hirs.attestationca.entity.Device;
-import hirs.attestationca.entity.DeviceInfoReport;
+import hirs.data.persist.DeviceInfoReport;
 import hirs.attestationca.entity.EventLogMeasurements;
 import hirs.attestationca.entity.ReferenceDigestValue;
 import hirs.attestationca.entity.ReferenceManifest;
diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/entity/DeviceInfoReport.java b/HIRS_Utils/src/main/java/hirs/data/persist/DeviceInfoReport.java
similarity index 99%
rename from HIRS_AttestationCA/src/main/java/hirs/attestationca/entity/DeviceInfoReport.java
rename to HIRS_Utils/src/main/java/hirs/data/persist/DeviceInfoReport.java
index 0dda20a6..47dd27a4 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/entity/DeviceInfoReport.java
+++ b/HIRS_Utils/src/main/java/hirs/data/persist/DeviceInfoReport.java
@@ -1,7 +1,5 @@
-package hirs.attestationca.entity;
+package hirs.data.persist;
 
-import hirs.data.persist.Digest;
-import hirs.data.persist.Report;
 import hirs.data.persist.info.FirmwareInfo;
 import hirs.data.persist.info.HardwareInfo;
 import hirs.data.persist.info.NetworkInfo;
diff --git a/HIRS_Utils/src/main/java/hirs/data/persist/enums/DigestAlgorithm.java b/HIRS_Utils/src/main/java/hirs/data/persist/enums/DigestAlgorithm.java
index 0d78ef80..5a69ed0d 100644
--- a/HIRS_Utils/src/main/java/hirs/data/persist/enums/DigestAlgorithm.java
+++ b/HIRS_Utils/src/main/java/hirs/data/persist/enums/DigestAlgorithm.java
@@ -1,7 +1,6 @@
 package hirs.data.persist.enums;
 
 import hirs.data.persist.AbstractDigest;
-import hirs.data.persist.DeviceInfoReport;
 
 import java.io.Serializable;
 
@@ -39,7 +38,7 @@ public enum DigestAlgorithm implements Serializable {
      * Condition used when an algorithm is not specified and
      * the size doesn't match known digests.
      */
-    UNSPECIFIED(DeviceInfoReport.NOT_SPECIFIED, Integer.BYTES);
+    UNSPECIFIED("Not Specified", Integer.BYTES);
 
     private final String standardAlgorithmName;