diff --git a/lsteamclient/gen.sh b/lsteamclient/gen.sh
index 2ac0dbc1..03b40015 100755
--- a/lsteamclient/gen.sh
+++ b/lsteamclient/gen.sh
@@ -5,8 +5,9 @@ rm win*.c
 rm win*.dat
 rm cpp*.cpp
 rm cpp*.h
-rm cb*.h
-rm cb*.cpp
+rm struct*.h
+rm struct*.cpp
+rm struct*.dat
 rm cb*.dat
 
 ./gen_wrapper.py
diff --git a/lsteamclient/gen_wrapper.py b/lsteamclient/gen_wrapper.py
index 745accaa..39272fbb 100755
--- a/lsteamclient/gen_wrapper.py
+++ b/lsteamclient/gen_wrapper.py
@@ -411,7 +411,7 @@ def handle_callback_struct(sdkver, callback, cb_num):
 
     generated_cb_ids.append(cb_id)
 
-    filename_base = "cb_converters_%s" % sdkver
+    filename_base = "struct_converters_%s" % sdkver
     cppname = "%s.cpp" % filename_base
     file_exists = os.path.isfile(cppname)
     cppfile = open(cppname, "a")
@@ -427,10 +427,10 @@ def handle_callback_struct(sdkver, callback, cb_num):
         cppfile.write("extern \"C\" {\n")
         cpp_files_need_close_brace.append(cppname)
 
-    datfile = open("cb_converters.dat", "a")
+    datfile = open("struct_converters.dat", "a")
     datfile.write("case 0x%08x: win_msg->m_cubParam = sizeof(struct win%s); win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_%s(lin_msg.m_pubParam, win_msg->m_pubParam); break;\n" % (cb_id, handler_name, handler_name))
 
-    hfile = open("cb_converters.h", "a")
+    hfile = open("struct_converters.h", "a")
     hfile.write("struct win%s {\n" % handler_name)
     for m in callback.get_children():
         if m.kind == clang.cindex.CursorKind.FIELD_DECL:
diff --git a/lsteamclient/cb_converters.dat b/lsteamclient/struct_converters.dat
similarity index 100%
rename from lsteamclient/cb_converters.dat
rename to lsteamclient/struct_converters.dat
diff --git a/lsteamclient/cb_converters.h b/lsteamclient/struct_converters.h
similarity index 100%
rename from lsteamclient/cb_converters.h
rename to lsteamclient/struct_converters.h
diff --git a/lsteamclient/cb_converters_100.cpp b/lsteamclient/struct_converters_100.cpp
similarity index 100%
rename from lsteamclient/cb_converters_100.cpp
rename to lsteamclient/struct_converters_100.cpp
diff --git a/lsteamclient/cb_converters_102.cpp b/lsteamclient/struct_converters_102.cpp
similarity index 100%
rename from lsteamclient/cb_converters_102.cpp
rename to lsteamclient/struct_converters_102.cpp
diff --git a/lsteamclient/cb_converters_104.cpp b/lsteamclient/struct_converters_104.cpp
similarity index 100%
rename from lsteamclient/cb_converters_104.cpp
rename to lsteamclient/struct_converters_104.cpp
diff --git a/lsteamclient/cb_converters_111.cpp b/lsteamclient/struct_converters_111.cpp
similarity index 100%
rename from lsteamclient/cb_converters_111.cpp
rename to lsteamclient/struct_converters_111.cpp
diff --git a/lsteamclient/cb_converters_112.cpp b/lsteamclient/struct_converters_112.cpp
similarity index 100%
rename from lsteamclient/cb_converters_112.cpp
rename to lsteamclient/struct_converters_112.cpp
diff --git a/lsteamclient/cb_converters_116.cpp b/lsteamclient/struct_converters_116.cpp
similarity index 100%
rename from lsteamclient/cb_converters_116.cpp
rename to lsteamclient/struct_converters_116.cpp
diff --git a/lsteamclient/cb_converters_117.cpp b/lsteamclient/struct_converters_117.cpp
similarity index 100%
rename from lsteamclient/cb_converters_117.cpp
rename to lsteamclient/struct_converters_117.cpp
diff --git a/lsteamclient/cb_converters_118.cpp b/lsteamclient/struct_converters_118.cpp
similarity index 100%
rename from lsteamclient/cb_converters_118.cpp
rename to lsteamclient/struct_converters_118.cpp
diff --git a/lsteamclient/cb_converters_122.cpp b/lsteamclient/struct_converters_122.cpp
similarity index 100%
rename from lsteamclient/cb_converters_122.cpp
rename to lsteamclient/struct_converters_122.cpp
diff --git a/lsteamclient/cb_converters_124.cpp b/lsteamclient/struct_converters_124.cpp
similarity index 100%
rename from lsteamclient/cb_converters_124.cpp
rename to lsteamclient/struct_converters_124.cpp
diff --git a/lsteamclient/cb_converters_125.cpp b/lsteamclient/struct_converters_125.cpp
similarity index 100%
rename from lsteamclient/cb_converters_125.cpp
rename to lsteamclient/struct_converters_125.cpp
diff --git a/lsteamclient/cb_converters_128.cpp b/lsteamclient/struct_converters_128.cpp
similarity index 100%
rename from lsteamclient/cb_converters_128.cpp
rename to lsteamclient/struct_converters_128.cpp
diff --git a/lsteamclient/cb_converters_132.cpp b/lsteamclient/struct_converters_132.cpp
similarity index 100%
rename from lsteamclient/cb_converters_132.cpp
rename to lsteamclient/struct_converters_132.cpp
diff --git a/lsteamclient/cb_converters_134.cpp b/lsteamclient/struct_converters_134.cpp
similarity index 100%
rename from lsteamclient/cb_converters_134.cpp
rename to lsteamclient/struct_converters_134.cpp
diff --git a/lsteamclient/cb_converters_136.cpp b/lsteamclient/struct_converters_136.cpp
similarity index 100%
rename from lsteamclient/cb_converters_136.cpp
rename to lsteamclient/struct_converters_136.cpp
diff --git a/lsteamclient/cb_converters_137.cpp b/lsteamclient/struct_converters_137.cpp
similarity index 100%
rename from lsteamclient/cb_converters_137.cpp
rename to lsteamclient/struct_converters_137.cpp
diff --git a/lsteamclient/cb_converters_140.cpp b/lsteamclient/struct_converters_140.cpp
similarity index 100%
rename from lsteamclient/cb_converters_140.cpp
rename to lsteamclient/struct_converters_140.cpp
diff --git a/lsteamclient/cb_converters_141.cpp b/lsteamclient/struct_converters_141.cpp
similarity index 100%
rename from lsteamclient/cb_converters_141.cpp
rename to lsteamclient/struct_converters_141.cpp
diff --git a/lsteamclient/cb_converters_142.cpp b/lsteamclient/struct_converters_142.cpp
similarity index 100%
rename from lsteamclient/cb_converters_142.cpp
rename to lsteamclient/struct_converters_142.cpp