diff --git a/HIRS_Utils/src/main/java/hirs/tpm/eventlog/uefi/UefiBootOrder.java b/HIRS_Utils/src/main/java/hirs/tpm/eventlog/uefi/UefiBootOrder.java
index 27f04858..06e2291b 100644
--- a/HIRS_Utils/src/main/java/hirs/tpm/eventlog/uefi/UefiBootOrder.java
+++ b/HIRS_Utils/src/main/java/hirs/tpm/eventlog/uefi/UefiBootOrder.java
@@ -3,7 +3,7 @@ package hirs.tpm.eventlog.uefi;
 /**
  * Class to process a UEFI BootOrder variable.
  * UEFI spec version 2.8 section 3.3 on page 83 defines the Boot Order as:
- *     an array of UINT16’s that make up an ordered list of the Boot#### options.
+ *     an array of UINT16s that make up an ordered list of the Boot#### options.
  */
 public class UefiBootOrder {
   /** list of UINT16 Boot#### numbers.*/
diff --git a/HIRS_Utils/src/main/java/hirs/tpm/eventlog/uefi/UefiDevicePath.java b/HIRS_Utils/src/main/java/hirs/tpm/eventlog/uefi/UefiDevicePath.java
index 57574e57..069736ea 100644
--- a/HIRS_Utils/src/main/java/hirs/tpm/eventlog/uefi/UefiDevicePath.java
+++ b/HIRS_Utils/src/main/java/hirs/tpm/eventlog/uefi/UefiDevicePath.java
@@ -15,12 +15,12 @@ import hirs.utils.HexUtils;
  *    } EFI_DEVICE_PATH_PROTOCOL;
  *
  *  Where Type is defined in the UEFI spec section 10:
- *    Type 0x01 – Hardware Device Path
- *    Type 0x02 – ACPI Device Path
- *    Type 0x03 – Messaging Device Path
- *    Type 0x04 – Media Device Path
- *    Type 0x05 – BIOS Boot Specification Device Path
- *    Type 0x7F – End of Hardware Device Path
+ *    Type 0x01  Hardware Device Path
+ *    Type 0x02  ACPI Device Path
+ *    Type 0x03  Messaging Device Path
+ *    Type 0x04  Media Device Path
+ *    Type 0x05  BIOS Boot Specification Device Path
+ *    Type 0x7F  End of Hardware Device Path
  *  Each Type has a sub-type that may or may no be defined in the section
  *
  *  Only a few of the SubTypes have been implemented as there are many,
@@ -330,8 +330,8 @@ private String vendorSubType(final byte[] path, final int offset) {
  * Returns nvm device info.
  * UEFI Specification, Version 2.8.
  * Name space Identifier (NSID) and IEEE Extended Unique Identifier (EUI-64):
- * See “Links to UEFI-Related Documents”
- * (http://uefi.org/uefi under the headings “NVM Express Specification”.
+ * See Links to UEFI Related Documents
+ * (http://uefi.org/uefi under the headings NVM Express Specification.
  * @param path
  * @param offset
  * @return NVM device info.
diff --git a/HIRS_Utils/src/main/java/hirs/tpm/eventlog/uefi/UefiGuid.java b/HIRS_Utils/src/main/java/hirs/tpm/eventlog/uefi/UefiGuid.java
index 43e4b318..d683bbe2 100644
--- a/HIRS_Utils/src/main/java/hirs/tpm/eventlog/uefi/UefiGuid.java
+++ b/HIRS_Utils/src/main/java/hirs/tpm/eventlog/uefi/UefiGuid.java
@@ -246,9 +246,9 @@ public String getVendorTableReference() {
  // Linux Boot GUIDS
  // https://github.com/linuxboot/linuxboot/blob/master/boards/s2600wf/vendor-files.txt
  case "9cfd802c-09a1-43d6-8217-aa49c1f90d2c":
-                reference = "Intel® Management Engine BIOS Extension (Mebx)"; break;
+                reference = "Intel Management Engine BIOS Extension (Mebx)"; break;
  case "b62efbbb-3923-4cb9-a6e8-db818e828a80":
-                reference = "Intel® Management Engine BIOS Extension (Mebx) Setup Browser"; break;
+                reference = "Intel Management Engine BIOS Extension (Mebx) Setup Browser"; break;
  case "9ce4325e-003e-11e3-b582-b8ac6f199a57":
                 reference = "Non-Volatile Dual In-line Memory Module (NVDIMM) Driver"; break;
  case "ea9de6d5-7839-46f7-9e63-4de8b00e2e5d":