utils/vlog: Update Verilog to XML generation for new naming.

Signed-off-by: David Shah <davey1576@gmail.com>
Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
diff --git a/vlog_to_pbtype.py b/vlog_to_pbtype.py
index 4a73377..5af3601 100755
--- a/vlog_to_pbtype.py
+++ b/vlog_to_pbtype.py
@@ -158,9 +158,9 @@
             module_path = os.path.dirname(module_file)
             module_basename = os.path.basename(module_file)
             # Heuristic for autogenerated files from w.py
-            wm = re.match(r"sim\.([A-Za-z0-9_]+)\.v", module_basename)
+            wm = re.match(r"([A-Za-z0-9_]+)\.sim\.v", module_basename)
             if wm:
-                pb_type_path = "%s/pb_type.%s.xml" % (module_path, wm.group(1))
+                pb_type_path = "%s/%s.pb_type.xml" % (module_path, wm.group(1))
             else:
                 pb_type_path = "%s/pb_type.xml" % module_path
             include_xml(xml_parent, pb_type_path)