diff --git a/src/materialsystem/texturestreaming.h b/src/materialsystem/texturestreaming.h
index ab606ff8..a666b164 100644
--- a/src/materialsystem/texturestreaming.h
+++ b/src/materialsystem/texturestreaming.h
@@ -67,12 +67,12 @@ struct TextureStreamMgr_s
 	int fileHandle; // STBSP file handle.
 	char gap_10b[4];
 	char* stringBuffer;
-	StreamDBHeader_s header;
-	ST_ResidentPage* residentPages;
+	StreamDB_Header_s header;
+	StreamDB_ResidentPage_s* residentPages;
 	MaterialGlue_t** materials;
-	ST_Material* materialInfo;
+	StreamDB_Material_s* materialInfo;
 	int64 maxResidentPageSize;
-	StreamingDBPageState_s pageStates[4];
+	StreamDB_PageState_s pageStates[4];
 	int picMip;
 	float streamBspBucketBias;
 	float streamBspDistScale;
diff --git a/src/public/rtech/istreamdb.h b/src/public/rtech/istreamdb.h
index c2dd9ec3..e833e978 100644
--- a/src/public/rtech/istreamdb.h
+++ b/src/public/rtech/istreamdb.h
@@ -10,45 +10,13 @@
 #define STBSP_FILE_EXTENSION "stbsp"
 #define STBSP_NOMINAL_TEX_RES 4096
 
-struct StreamDBLump_s
+struct StreamDB_Lump_s
 {
-	uint64_t offset;
-	uint64_t count;
+	uint64 offset;
+	uint64 count;
 };
 
-struct StreamDBHeader_s
-{
-	uint32_t magic;
-	uint16_t majorVersion;
-	uint16_t minorVersion;
-	char unkPad1[20];
-	float unk1;
-	float unk2;
-	char unkPad2[130];
-	StreamDBLump_s lumps[6];
-	char unkPad3[128];
-};
-
-struct StreamingDBPageState_s
-{
-	int page;
-	int unk;
-	char* pageData;
-	char gap_10[8];
-};
-
-struct ST_ResidentPage
-{
-	uint64_t dataOffset;
-	int dataSize;
-	float coverageScale;
-	uint16_t minCellX;
-	uint16_t minCellY;
-	uint16_t maxCellX;
-	uint16_t maxCellY;
-};
-
-struct ST_Material
+struct StreamDB_Material_s
 {
 	int nameOffset;
 	char unk[4];
@@ -56,4 +24,36 @@ struct ST_Material
 	char unk2[8];
 };
 
+struct StreamDB_Header_s
+{
+	uint32 magic;
+	uint16 majorVersion;
+	uint16 minorVersion;
+	char unkPad1[20];
+	float unk1;
+	float unk2;
+	char unkPad2[130];
+	StreamDB_Lump_s lumps[6];
+	char unkPad3[128];
+};
+
+struct StreamDB_PageState_s
+{
+	int page;
+	int unk;
+	char* pageData;
+	char gap_10[8];
+};
+
+struct StreamDB_ResidentPage_s
+{
+	uint64 dataOffset;
+	int dataSize;
+	float coverageScale;
+	uint16 minCellX;
+	uint16 minCellY;
+	uint16 maxCellX;
+	uint16 maxCellY;
+};
+
 #endif // RTECH_ISTREAMDB