utils/vlog: Rename YosyJson -> YosysJSON

Signed-off-by: David Shah <davey1576@gmail.com>
diff --git a/vlog_to_model.py b/vlog_to_model.py
index d4e0d62..de0ba9e 100755
--- a/vlog_to_model.py
+++ b/vlog_to_model.py
@@ -19,7 +19,7 @@
 import lxml.etree as ET
 
 import yosys.run
-from yosys.json import YosysJson
+from yosys.json import YosysJSON
 
 
 parser = argparse.ArgumentParser(description=__doc__.strip())
@@ -49,7 +49,7 @@
 aig_json = yosys.run.vlog_to_json(args.infiles, True, True)
 
 if args.top is not None:
-    yj = YosysJson(aig_json, args.top)
+    yj = YosysJSON(aig_json, args.top)
     top = yj.top
 else:
     wm = re.match(r"([A-Za-z0-9_]+)\.sim\.v", iname)
@@ -58,7 +58,7 @@
     else:
         print("ERROR file name not of format %.sim.v ({}), cannot detect top level. Manually specify the top level module using --top").format(iname)
         sys.exit(1)
-    yj = YosysJson(aig_json, top)
+    yj = YosysJSON(aig_json, top)
 
 if top is None:
     print("ERROR: more than one module in design, cannot detect top level. Manually specify the top level module using --top")
diff --git a/vlog_to_pbtype.py b/vlog_to_pbtype.py
index d04cef0..1808f1b 100755
--- a/vlog_to_pbtype.py
+++ b/vlog_to_pbtype.py
@@ -13,7 +13,7 @@
     - `(* CLASS="lut|routing|mux|flipflop|mem" *)` : specify the class of an given
     instance.
 
-    - `(* MODES="mode1;mode2;..." *)` : specify that the module has more than one functional
+    - `(* MODES="mode1, mode2, ..." *)` : specify that the module has more than one functional
     mode, each with a given name. The module will be evaluated n times, each time setting
     the MODE parameter to the nth value in the list of mode names. Each evaluation will be
     put in a pb_type `<mode>` section named accordingly.
@@ -51,7 +51,7 @@
 import lxml.etree as ET
 
 import yosys.run
-from yosys.json import YosysJson
+from yosys.json import YosysJSON
 
 parser = argparse.ArgumentParser(description=__doc__.strip(), formatter_class=argparse.RawTextHelpFormatter)
 parser.add_argument(
@@ -79,7 +79,7 @@
 
 yosys.run.add_define("PB_TYPE")
 vjson = yosys.run.vlog_to_json(args.infiles, False, False)
-yj = YosysJson(vjson)
+yj = YosysJSON(vjson)
 
 xi_url = "http://www.w3.org/2001/XInclude"
 ET.register_namespace('xi', xi_url)
@@ -305,7 +305,7 @@
             smode = mode.strip()
             mode_xml = ET.SubElement(pb_type_xml, "mode", {"name" : smode})
             # Rerun Yosys with mode parameter
-            mode_yj = YosysJson(yosys.run.vlog_to_json(args.infiles, False, False, smode, mod.name))
+            mode_yj = YosysJSON(yosys.run.vlog_to_json(args.infiles, False, False, smode, mod.name))
             mode_mod = mode_yj.module(mod.name)
             make_pb_content(mode_mod, mode_xml, mod_pname, True)
     else:
diff --git a/yosys/json.py b/yosys/json.py
index 1acf097..24cac80 100755
--- a/yosys/json.py
+++ b/yosys/json.py
@@ -191,7 +191,7 @@
         cell_drivers = self.conn_ports(net, "input")
         return io_drivers + cell_drivers
 
-class YosysJson:
+class YosysJSON:
 
     def __init__(self, j, top = None):
         """Takes either the filename to a JSON file, or already parsed JSON