diff --git a/libpldmresponder/examples/fru/Board_General.json b/libpldmresponder/examples/fru/Board_General.json
index fc58c3c..c9914b6 100644
--- a/libpldmresponder/examples/fru/Board_General.json
+++ b/libpldmresponder/examples/fru/Board_General.json
@@ -1,19 +1,19 @@
-# This JSON has the information needed to create General FRU record for FRU of
-# type Board. The FRU fields are based on the PLDM specification DSP0257.
+// This JSON has the information needed to create General FRU record for FRU of
+// type Board. The FRU fields are based on the PLDM specification DSP0257.
 {
    "record_details":
    {
-        # FRU Record Type - General FRU Record
+        // FRU Record Type - General FRU Record
         "fru_record_type" : 1,
-        # Encoding Type for FRU fields - ASCII
+        // Encoding Type for FRU fields - ASCII
         "fru_encoding_type": 1,
         "dbus_interface_name": "xyz.openbmc_project.Inventory.Item.Board"
    },
    "fru_fields":[
       {
-         # FRU Field Type 3 - Part Number
+         // FRU Field Type 3 - Part Number
          "fru_field_type" : 3,
-         # D-Bus property to read and populate the FRU field
+         // D-Bus property to read and populate the FRU field
          "dbus":
             {
                "interface" : "xyz.openbmc_project.Inventory.Decorator.Asset",
@@ -22,9 +22,9 @@
             }
       },
       {
-         # FRU Field Type 4 - Serial Number
+         // FRU Field Type 4 - Serial Number
          "fru_field_type" : 4,
-         # D-Bus property to read and populate the FRU field
+         // D-Bus property to read and populate the FRU field
          "dbus":
             {
                "interface" : "xyz.openbmc_project.Inventory.Decorator.Asset",
diff --git a/libpldmresponder/examples/fru/Board_VINI.json b/libpldmresponder/examples/fru/Board_VINI.json
index fd58717..fbb710a 100644
--- a/libpldmresponder/examples/fru/Board_VINI.json
+++ b/libpldmresponder/examples/fru/Board_VINI.json
@@ -1,19 +1,19 @@
-# This JSON has the information needed to create OEM FRU record VINI for FRU of
-# type Board.
+// This JSON has the information needed to create OEM FRU record VINI for FRU of
+// type Board.
 {
    "record_details":
    {
-        # FRU Record Type - OEM FRU Record
+        // FRU Record Type - OEM FRU Record
         "fru_record_type" : 254,
-        # Encoding Type for FRU fields - ASCII
+        // Encoding Type for FRU fields - ASCII
         "fru_encoding_type": 1,
         "dbus_interface_name": "xyz.openbmc_project.Inventory.Item.Board"
    },
    "fru_fields":[
       {
-         # FRU Field Type 2 - Keyword RT
+         // FRU Field Type 2 - Keyword RT
          "fru_field_type" : 2,
-         # D-Bus property to read and populate the FRU field
+         // D-Bus property to read and populate the FRU field
          "dbus":
             {
                "interface" : "com.ibm.ipzvpd.VINI",
@@ -22,9 +22,9 @@
             }
       },
       {
-         # FRU Field Type 3 - Keyword B3
+         // FRU Field Type 3 - Keyword B3
          "fru_field_type" : 3,
-         # D-Bus property to read and populate the FRU field
+         // D-Bus property to read and populate the FRU field
          "dbus":
             {
                "interface" : "com.ibm.ipzvpd.VINI",
diff --git a/libpldmresponder/examples/fru/Cpu_General.json b/libpldmresponder/examples/fru/Cpu_General.json
index 8021001..3595d79 100644
--- a/libpldmresponder/examples/fru/Cpu_General.json
+++ b/libpldmresponder/examples/fru/Cpu_General.json
@@ -1,19 +1,19 @@
-# This JSON has the information needed to create General FRU record for FRU of
-# type Cpu. The FRU fields are based on the PLDM specification DSP0257.
+// This JSON has the information needed to create General FRU record for FRU of
+// type Cpu. The FRU fields are based on the PLDM specification DSP0257.
 {
    "record_details":
    {
-        # FRU Record Type - General FRU Record
+        // FRU Record Type - General FRU Record
         "fru_record_type" : 1,
-        # Encoding Type for FRU fields - ASCII
+        // Encoding Type for FRU fields - ASCII
         "fru_encoding_type": 1,
         "dbus_interface_name": "xyz.openbmc_project.Inventory.Item.Cpu"
    },
    "fru_fields":[
       {
-         # FRU Field Type 3 - Part Number
+         // FRU Field Type 3 - Part Number
          "fru_field_type" : 3,
-         # D-Bus property to read and populate the FRU field
+         // D-Bus property to read and populate the FRU field
          "dbus":
             {
                "interface" : "xyz.openbmc_project.Inventory.Decorator.Asset",
@@ -22,9 +22,9 @@
             }
       },
       {
-         # FRU Field Type 4 - Serial Number
+         // FRU Field Type 4 - Serial Number
          "fru_field_type" : 4,
-         # D-Bus property to read and populate the FRU field
+         // D-Bus property to read and populate the FRU field
          "dbus":
             {
                "interface" : "xyz.openbmc_project.Inventory.Decorator.Asset",
diff --git a/libpldmresponder/examples/fru/FRU_Master.json b/libpldmresponder/examples/fru/FRU_Master.json
index 73c7ebb..710c5e1 100644
--- a/libpldmresponder/examples/fru/FRU_Master.json
+++ b/libpldmresponder/examples/fru/FRU_Master.json
@@ -1,16 +1,16 @@
-# This is the master config file for generating PLDM FRU records from the D-Bus
-# inventory objects. "service" is the name of D-Bus service hosting the
-# inventory D-Bus objects, "root_path" is the root path for all the inventory
-# D-Bus objects and "entities" section specifies the type of FRU's for which
-# FRU records are created in the FRU table. FRU Record Set PDR and Entity
-# Association PDR are generated for matching FRU. In this example, PLDM FRU
-# records will be created for all FRU's of type Board and CPU. The "entity_type"
-# field is the PLDM entity type for Board and CPU. For each FRU type,
-# corresponding config JSON's are needed for each record. In the example
-# directory, Board_General.json is the config to generate the General FRU
-# record for FRU of type Board and Board_VINI.json is the config to generate
-# the OEM record (VINI is a record in IBM IPZ VPD format) for FRU of type Board.
-# For all instances of the same FRU, the same config JSON will apply.
+// This is the master config file for generating PLDM FRU records from the D-Bus
+// inventory objects. "service" is the name of D-Bus service hosting the
+// inventory D-Bus objects, "root_path" is the root path for all the inventory
+// D-Bus objects and "entities" section specifies the type of FRU's for which
+// FRU records are created in the FRU table. FRU Record Set PDR and Entity
+// Association PDR are generated for matching FRU. In this example, PLDM FRU
+// records will be created for all FRU's of type Board and CPU. The "entity_type"
+// field is the PLDM entity type for Board and CPU. For each FRU type,
+// corresponding config JSON's are needed for each record. In the example
+// directory, Board_General.json is the config to generate the General FRU
+// record for FRU of type Board and Board_VINI.json is the config to generate
+// the OEM record (VINI is a record in IBM IPZ VPD format) for FRU of type Board.
+// For all instances of the same FRU, the same config JSON will apply.
 {
     "service":"xyz.openbmc_project.Inventory.Manager",
     "root_path":"/xyz/openbmc_project/inventory",
diff --git a/libpldmresponder/examples/fru/host_frus.json b/libpldmresponder/examples/fru/host_frus.json
index 07107ff..d0348c1 100644
--- a/libpldmresponder/examples/fru/host_frus.json
+++ b/libpldmresponder/examples/fru/host_frus.json
@@ -1,11 +1,11 @@
 {
         "entities":[
             {
-                # Entity Type 64 from the host has ...
+                // Entity Type 64 from the host has ...
                 "entity_type" : 64,
                 "parent":
                      {
-                        # ... entity type 100 and instance 1 on the BMC as parent
+                        // ... entity type 100 and instance 1 on the BMC as parent
                         "entity_type" : 100,
                         "entity_instance" : 1
                      }