diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/ComponentClass.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/ComponentClass.java
index 40d9a5cc..21509339 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/ComponentClass.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/ComponentClass.java
@@ -30,7 +30,7 @@ public class ComponentClass {
     private static final String TCG_COMPONENT_REGISTRY = "2.23.133.18.3.1";
     private static final String SMBIOS_COMPONENT_REGISTRY = "2.23.133.18.3.3";
     private static final Path JSON_PATH = FileSystems.getDefault()
-            .getPath("/opt", "hirs", "default-properties", "component-class.json");
+            .getPath("/etc", "hirs", "aca", "default-properties", "component-class.json");
 
     private static final String OTHER_STRING = "Other";
     private static final String UNKNOWN_STRING = "Unknown";
diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/service/SupplyChainValidationService.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/service/SupplyChainValidationService.java
index c3ac6a91..e9e44d77 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/service/SupplyChainValidationService.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/service/SupplyChainValidationService.java
@@ -117,6 +117,7 @@ public class SupplyChainValidationService {
             // store the device with the credential
             if (ec != null) {
                 ec.setDeviceId(device.getId());
+                ec.setDeviceName(device.getDeviceInfo().getNetworkInfo().getHostname());
                 this.certificateRepository.save(ec);
             }
         }
@@ -147,6 +148,7 @@ public class SupplyChainValidationService {
                         deltaMapping.put(pc, null);
                     }
                     pc.setDeviceId(device.getId());
+                    pc.setDeviceName(device.getDeviceInfo().getNetworkInfo().getHostname());
                     this.certificateRepository.save(pc);
                 }
 
diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificatePageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificatePageController.java
index f6f6a59a..60a81689 100644
--- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificatePageController.java
+++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificatePageController.java
@@ -832,11 +832,11 @@ public class CertificatePageController extends PageController<NoPageParams> {
             log.error(failMessage, dEx);
             messages.addError(failMessage + dEx.getMessage());
             return null;
-        } catch (IllegalArgumentException e) {
+        } catch (IllegalArgumentException iaEx) {
             final String failMessage = String.format(
                     "Certificate format not recognized(%s): ", fileName);
-            log.error(failMessage, e);
-            messages.addError(failMessage + e.getMessage());
+            log.error(failMessage, iaEx);
+            messages.addError(failMessage + iaEx.getMessage());
             return null;
         }
     }
@@ -864,11 +864,11 @@ public class CertificatePageController extends PageController<NoPageParams> {
             existingCertificate = getCertificateByHash(
                     certificateType,
                     certificate.getCertificateHash());
-        } catch (DBServiceException e) {
+        } catch (DBServiceException dbsEx) {
             final String failMessage = "Querying for existing certificate failed ("
                     + fileName + "): ";
-            messages.addError(failMessage + e.getMessage());
-            log.error(failMessage, e);
+            messages.addError(failMessage + dbsEx.getMessage());
+            log.error(failMessage, dbsEx);
             return;
         }
 
@@ -924,11 +924,11 @@ public class CertificatePageController extends PageController<NoPageParams> {
                 log.info(successMsg);
                 return;
             }
-        } catch (DBServiceException e) {
+        } catch (DBServiceException dbsEx) {
             final String failMessage = String.format("Storing new certificate failed (%s): ",
                     fileName);
-            messages.addError(failMessage + e.getMessage());
-            log.error(failMessage, e);
+            messages.addError(failMessage + dbsEx.getMessage());
+            log.error(failMessage, dbsEx);
             return;
         }
 
@@ -946,12 +946,12 @@ public class CertificatePageController extends PageController<NoPageParams> {
                 log.info(successMsg);
                 return;
             }
-        } catch (DBServiceException e) {
+        } catch (DBServiceException dbsEx) {
             final String failMessage = String.format("Found an identical"
                     + " pre-existing certificate in the "
                     + "archive, but failed to unarchive it (%s): ", fileName);
-            messages.addError(failMessage + e.getMessage());
-            log.error(failMessage, e);
+            messages.addError(failMessage + dbsEx.getMessage());
+            log.error(failMessage, dbsEx);
             return;
         }
 
diff --git a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiGuid.java b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiGuid.java
index 5530258c..6c63ee2e 100644
--- a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiGuid.java
+++ b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiGuid.java
@@ -23,8 +23,8 @@ public class UefiGuid {
      */
     private static final int UUID_EPOCH_DIVISOR = 10000;
 
-    private static final Path JSON_PATH = FileSystems.getDefault().getPath("/opt",
-            "hirs", "default-properties", "vendor-table.json");
+    private static final Path JSON_PATH = FileSystems.getDefault().getPath("/etc",
+            "hirs", "aca", "default-properties", "vendor-table.json");
     private JsonObject uefiVendorRef;
     /**
      * guid byte array.
@@ -175,10 +175,7 @@ public class UefiGuid {
      * @return true if the uuid is the Empty UUID, false if not
      */
     public boolean isUnknownUUID() {
-        if (getVendorTableReference().equals("Unknown GUID reference")) {
-            return true;
-        }
-        return false;
+        return getVendorTableReference().equals("Unknown GUID reference");
     }
 
     /**