diff --git a/src/formats.c b/src/formats.c
index 8aed72d3..6e491837 100644
--- a/src/formats.c
+++ b/src/formats.c
@@ -561,34 +561,34 @@ static const layout_info layout_info_list[] = {
         {layout_aix,                    "AIX interleave, internally 18-byte interleaved"},
         {layout_scd_int,                "SCD multistream interleave"},
 
-        {layout_mxch_blocked,           "MxCh blocked"},
-        {layout_ast_blocked,            "AST blocked"},
-        {layout_halpst_blocked,         "HALPST blocked"},
-        {layout_xa_blocked,             "CD-ROM XA"},
+        {layout_blocked_mxch,           "blocked (MxCh)"},
+        {layout_blocked_ast,            "blocked (AST)"},
+        {layout_blocked_halpst,         "blocked (HALPST)"},
+        {layout_blocked_xa,             "blocked (XA)"},
         {layout_blocked_ea_schl,        "blocked (EA SCHl)"},
         {layout_blocked_ea_1snh,        "blocked (EA 1SNh)"},
         {layout_blocked_caf,            "blocked (CAF)"},
         {layout_blocked_wsi,            "blocked (WSI)"},
-        {layout_xvas_blocked,           ".xvas blocked"},
-        {layout_str_snds_blocked,       ".str SNDS blocked"},
-        {layout_ws_aud_blocked,         "Westwood Studios .aud blocked"},
-        {layout_matx_blocked,           "Matrix .matx blocked"},
+        {layout_blocked_xvas,           "blocked (.xvas)"},
+        {layout_blocked_str_snds,       "blocked (.str SNDS)"},
+        {layout_blocked_ws_aud,         "blocked (Westwood Studios .aud)"},
+        {layout_blocked_matx,           "blocked (Matrix .matx)"},
         {layout_blocked_dec,            "blocked (DEC)"},
-        {layout_vs_blocked,             "vs blocked"},
-        {layout_emff_ps2_blocked,       "EMFF (PS2) blocked"},
-        {layout_emff_ngc_blocked,       "EMFF (NGC/WII) blocked"},
-        {layout_gsb_blocked,            "GSB blocked"},
-        {layout_thp_blocked,            "THP Movie Audio blocked"},
-        {layout_filp_blocked,           "FILp blocked"},
+        {layout_blocked_vs,             "blocked (vs)"},
+        {layout_blocked_emff_ps2,       "blocked (EMFF PS2)"},
+        {layout_blocked_emff_ngc,       "blocked (EMFF NGC)"},
+        {layout_blocked_gsb,            "blocked (GSB)"},
+        {layout_blocked_thp,            "blocked (THP Movie Audio)"},
+        {layout_blocked_filp,           "blocked (FILP)"},
         {layout_blocked_ea_swvr,        "blocked (EA SWVR)"},
         {layout_blocked_adm,            "blocked (ADM)"},
-        {layout_dsp_bdsp_blocked,       "DSP blocked"},
+        {layout_blocked_bdsp,           "blocked (BDSP)"},
         {layout_blocked_ivaud,          "blocked (IVAUD)"},
-        {layout_ps2_iab_blocked,        "IAB blocked"},
-        {layout_ps2_strlr_blocked,      "The Bouncer STR blocked"},
+        {layout_blocked_ps2_iab,        "blocked (IAB)"},
+        {layout_blocked_ps2_strlr,      "blocked (The Bouncer STR)"},
         {layout_blocked_rws,            "blocked (RWS)"},
         {layout_blocked_hwas,           "blocked (HWAS)"},
-        {layout_tra_blocked,            "TRA blocked"},
+        {layout_blocked_tra,            "blocked (TRA)"},
         {layout_blocked_ea_sns,         "blocked (EA SNS)"},
         {layout_blocked_awc,            "blocked (AWC)"},
         {layout_blocked_vgs,            "blocked (VGS)"},
diff --git a/src/layout/blocked.c b/src/layout/blocked.c
index 92e229b2..16b0ce06 100644
--- a/src/layout/blocked.c
+++ b/src/layout/blocked.c
@@ -65,20 +65,20 @@ void render_vgmstream_blocked(sample * buffer, int32_t sample_count, VGMSTREAM *
         if (vgmstream->samples_into_block==samples_this_block
                 /*&& vgmstream->current_sample < vgmstream->num_samples*/) { /* don't go past last block */
             switch (vgmstream->layout_type) {
-                case layout_ast_blocked:
-                    ast_block_update(vgmstream->next_block_offset,vgmstream);
+                case layout_blocked_ast:
+                    block_update_ast(vgmstream->next_block_offset,vgmstream);
                     break;
-                case layout_mxch_blocked:
-                    mxch_block_update(vgmstream->next_block_offset,vgmstream);
+                case layout_blocked_mxch:
+                    block_update_mxch(vgmstream->next_block_offset,vgmstream);
                     break;
-                case layout_halpst_blocked:
+                case layout_blocked_halpst:
                     if (vgmstream->next_block_offset>=0)
-                        halpst_block_update(vgmstream->next_block_offset,vgmstream);
+                        block_update_halpst(vgmstream->next_block_offset,vgmstream);
                     else
                         vgmstream->current_block_offset = -1;
                     break;
-                case layout_xa_blocked:
-                    xa_block_update(vgmstream->next_block_offset,vgmstream);
+                case layout_blocked_xa:
+                    block_update_xa(vgmstream->next_block_offset,vgmstream);
                     break;
                 case layout_blocked_ea_schl:
                     block_update_ea_schl(vgmstream->next_block_offset,vgmstream);
@@ -92,38 +92,38 @@ void render_vgmstream_blocked(sample * buffer, int32_t sample_count, VGMSTREAM *
                 case layout_blocked_wsi:
                     block_update_wsi(vgmstream->next_block_offset,vgmstream);
                     break;
-                case layout_str_snds_blocked:
-                    str_snds_block_update(vgmstream->next_block_offset,vgmstream);
+                case layout_blocked_str_snds:
+                    block_update_str_snds(vgmstream->next_block_offset,vgmstream);
                     break;
-                case layout_ws_aud_blocked:
-                    ws_aud_block_update(vgmstream->next_block_offset,vgmstream);
+                case layout_blocked_ws_aud:
+                    block_update_ws_aud(vgmstream->next_block_offset,vgmstream);
                     break;
-                case layout_matx_blocked:
-                    matx_block_update(vgmstream->next_block_offset,vgmstream);
+                case layout_blocked_matx:
+                    block_update_matx(vgmstream->next_block_offset,vgmstream);
                     break;
                 case layout_blocked_dec:
                     block_update_dec(vgmstream->next_block_offset,vgmstream);
                     break;
-                case layout_emff_ps2_blocked:
-                    emff_ps2_block_update(vgmstream->next_block_offset,vgmstream);
+                case layout_blocked_emff_ps2:
+                    block_update_emff_ps2(vgmstream->next_block_offset,vgmstream);
                     break;
-                case layout_emff_ngc_blocked:
-                    emff_ngc_block_update(vgmstream->next_block_offset,vgmstream);
+                case layout_blocked_emff_ngc:
+                    block_update_emff_ngc(vgmstream->next_block_offset,vgmstream);
                     break;
-                case layout_gsb_blocked:
-                    gsb_block_update(vgmstream->next_block_offset,vgmstream);
+                case layout_blocked_gsb:
+                    block_update_gsb(vgmstream->next_block_offset,vgmstream);
                     break;
-                case layout_vs_blocked:
-                    vs_block_update(vgmstream->next_block_offset,vgmstream);
+                case layout_blocked_vs:
+                    block_update_vs(vgmstream->next_block_offset,vgmstream);
                     break;
-                case layout_xvas_blocked:
-                    xvas_block_update(vgmstream->next_block_offset,vgmstream);
+                case layout_blocked_xvas:
+                    block_update_xvas(vgmstream->next_block_offset,vgmstream);
                     break;
-                case layout_thp_blocked:
-                    thp_block_update(vgmstream->next_block_offset,vgmstream);
+                case layout_blocked_thp:
+                    block_update_thp(vgmstream->next_block_offset,vgmstream);
                     break;
-                case layout_filp_blocked:
-                    filp_block_update(vgmstream->next_block_offset,vgmstream);
+                case layout_blocked_filp:
+                    block_update_filp(vgmstream->next_block_offset,vgmstream);
                     break;
                 case layout_blocked_ivaud:
                     block_update_ivaud(vgmstream->next_block_offset,vgmstream);
@@ -134,17 +134,17 @@ void render_vgmstream_blocked(sample * buffer, int32_t sample_count, VGMSTREAM *
                 case layout_blocked_adm:
                     block_update_adm(vgmstream->next_block_offset,vgmstream);
                     break;
-                case layout_dsp_bdsp_blocked:
-                    dsp_bdsp_block_update(vgmstream->next_block_offset,vgmstream);
+                case layout_blocked_bdsp:
+                    block_update_bdsp(vgmstream->next_block_offset,vgmstream);
                     break;
-                case layout_tra_blocked:
-                    tra_block_update(vgmstream->next_block_offset,vgmstream);
+                case layout_blocked_tra:
+                    block_update_tra(vgmstream->next_block_offset,vgmstream);
                     break;
-                case layout_ps2_iab_blocked:
-                    ps2_iab_block_update(vgmstream->next_block_offset,vgmstream);
+                case layout_blocked_ps2_iab:
+                    block_update_ps2_iab(vgmstream->next_block_offset,vgmstream);
                     break;
-                case layout_ps2_strlr_blocked:
-                    ps2_strlr_block_update(vgmstream->next_block_offset,vgmstream);
+                case layout_blocked_ps2_strlr:
+                    block_update_ps2_strlr(vgmstream->next_block_offset,vgmstream);
                     break;
                 case layout_blocked_rws:
                     block_update_rws(vgmstream->next_block_offset,vgmstream);
diff --git a/src/layout/ast_blocked.c b/src/layout/blocked_ast.c
similarity index 90%
rename from src/layout/ast_blocked.c
rename to src/layout/blocked_ast.c
index d882a0de..8ff32ba0 100644
--- a/src/layout/ast_blocked.c
+++ b/src/layout/blocked_ast.c
@@ -2,7 +2,7 @@
 #include "../vgmstream.h"
 
 /* set up for the block at the given offset */
-void ast_block_update(off_t block_offset, VGMSTREAM * vgmstream) {
+void block_update_ast(off_t block_offset, VGMSTREAM * vgmstream) {
     int i;
     vgmstream->current_block_offset = block_offset;
     vgmstream->current_block_size = read_32bitBE(
diff --git a/src/layout/bdsp_blocked.c b/src/layout/blocked_bdsp.c
similarity index 88%
rename from src/layout/bdsp_blocked.c
rename to src/layout/blocked_bdsp.c
index 88f640b6..f5e763ab 100644
--- a/src/layout/bdsp_blocked.c
+++ b/src/layout/blocked_bdsp.c
@@ -2,7 +2,7 @@
 #include "../vgmstream.h"
 
 /* set up for the block at the given offset */
-void dsp_bdsp_block_update(off_t block_offset, VGMSTREAM * vgmstream) {
+void block_update_bdsp(off_t block_offset, VGMSTREAM * vgmstream) {
     int i;
 
 	vgmstream->current_block_offset = block_offset;
diff --git a/src/layout/emff_blocked.c b/src/layout/blocked_emff.c
similarity index 89%
rename from src/layout/emff_blocked.c
rename to src/layout/blocked_emff.c
index b3ed7f5f..41ad197f 100644
--- a/src/layout/emff_blocked.c
+++ b/src/layout/blocked_emff.c
@@ -2,7 +2,7 @@
 #include "../vgmstream.h"
 
 /* set up for the block at the given offset */
-void emff_ps2_block_update(off_t block_offset, VGMSTREAM * vgmstream) {
+void block_update_emff_ps2(off_t block_offset, VGMSTREAM * vgmstream) {
     int i;
 
 	vgmstream->current_block_offset = block_offset;
@@ -17,7 +17,7 @@ void emff_ps2_block_update(off_t block_offset, VGMSTREAM * vgmstream) {
     }
 }
 
-void emff_ngc_block_update(off_t block_offset, VGMSTREAM * vgmstream) {
+void block_update_emff_ngc(off_t block_offset, VGMSTREAM * vgmstream) {
     int i;
 
 	vgmstream->current_block_offset = block_offset;
diff --git a/src/layout/filp_blocked.c b/src/layout/blocked_filp.c
similarity index 90%
rename from src/layout/filp_blocked.c
rename to src/layout/blocked_filp.c
index 550c6e73..6baea362 100644
--- a/src/layout/filp_blocked.c
+++ b/src/layout/blocked_filp.c
@@ -2,7 +2,7 @@
 #include "../vgmstream.h"
 
 /* set up for the block at the given offset */
-void filp_block_update(off_t block_offset, VGMSTREAM * vgmstream) {
+void block_update_filp(off_t block_offset, VGMSTREAM * vgmstream) {
     int i;
 
 	vgmstream->current_block_offset = block_offset;
diff --git a/src/layout/gsb_blocked.c b/src/layout/blocked_gsb.c
similarity index 93%
rename from src/layout/gsb_blocked.c
rename to src/layout/blocked_gsb.c
index eccd40d8..29a41771 100644
--- a/src/layout/gsb_blocked.c
+++ b/src/layout/blocked_gsb.c
@@ -2,7 +2,7 @@
 #include "../vgmstream.h"
 
 /* set up for the block at the given offset */
-void gsb_block_update(off_t block_offset, VGMSTREAM * vgmstream) {
+void block_update_gsb(off_t block_offset, VGMSTREAM * vgmstream) {
     int i;
     int block_header_size = 0x20; /*from header*/
     int block_channel_size = 0x8000; /*from header, per channel*/
diff --git a/src/layout/halpst_blocked.c b/src/layout/blocked_halpst.c
similarity index 92%
rename from src/layout/halpst_blocked.c
rename to src/layout/blocked_halpst.c
index 7c36c1bf..d9ec3763 100644
--- a/src/layout/halpst_blocked.c
+++ b/src/layout/blocked_halpst.c
@@ -2,7 +2,7 @@
 #include "../vgmstream.h"
 
 /* set up for the block at the given offset */
-void halpst_block_update(off_t block_offset, VGMSTREAM * vgmstream) {
+void block_update_halpst(off_t block_offset, VGMSTREAM * vgmstream) {
     int i, header_length;
     /* header length must be a multiple of 0x20 */
     header_length = (4+8*vgmstream->channels+0x1f)/0x20*0x20;
diff --git a/src/layout/ims_block.c b/src/layout/blocked_matx.c
similarity index 90%
rename from src/layout/ims_block.c
rename to src/layout/blocked_matx.c
index c5df5948..e69a0503 100644
--- a/src/layout/ims_block.c
+++ b/src/layout/blocked_matx.c
@@ -2,7 +2,7 @@
 #include "../vgmstream.h"
 
 /* set up for the block at the given offset */
-void matx_block_update(off_t block_offset, VGMSTREAM * vgmstream) {
+void block_update_matx(off_t block_offset, VGMSTREAM * vgmstream) {
     int i;
 
     vgmstream->current_block_offset = block_offset;
diff --git a/src/layout/mxch_blocked.c b/src/layout/blocked_mxch.c
similarity index 91%
rename from src/layout/mxch_blocked.c
rename to src/layout/blocked_mxch.c
index 8e49a4a9..f15afbcb 100644
--- a/src/layout/mxch_blocked.c
+++ b/src/layout/blocked_mxch.c
@@ -2,7 +2,7 @@
 #include "../vgmstream.h"
 
 //MxCh blocked layout as used by Lego Island
-void mxch_block_update(off_t block_offset, VGMSTREAM * vgmstream) {
+void block_update_mxch(off_t block_offset, VGMSTREAM * vgmstream) {
 	vgmstream->current_block_offset = block_offset;
 	vgmstream->next_block_offset = block_offset +
 		read_32bitLE(vgmstream->current_block_offset+4,vgmstream->ch[0].streamfile)+8;
diff --git a/src/layout/ps2_iab_blocked.c b/src/layout/blocked_ps2_iab.c
similarity index 90%
rename from src/layout/ps2_iab_blocked.c
rename to src/layout/blocked_ps2_iab.c
index 0b375b1e..e91c94a4 100644
--- a/src/layout/ps2_iab_blocked.c
+++ b/src/layout/blocked_ps2_iab.c
@@ -2,7 +2,7 @@
 #include "../vgmstream.h"
 
 /* set up for the block at the given offset */
-void ps2_iab_block_update(off_t block_offset, VGMSTREAM * vgmstream) {
+void block_update_ps2_iab(off_t block_offset, VGMSTREAM * vgmstream) {
     int i;
 
 	vgmstream->current_block_offset = block_offset;
diff --git a/src/layout/ps2_strlr_blocked.c b/src/layout/blocked_ps2_strlr.c
similarity index 89%
rename from src/layout/ps2_strlr_blocked.c
rename to src/layout/blocked_ps2_strlr.c
index 7bf23bda..d2834db5 100644
--- a/src/layout/ps2_strlr_blocked.c
+++ b/src/layout/blocked_ps2_strlr.c
@@ -2,7 +2,7 @@
 #include "../vgmstream.h"
 
 /* set up for the block at the given offset */
-void ps2_strlr_block_update(off_t block_offset, VGMSTREAM * vgmstream) {
+void block_update_ps2_strlr(off_t block_offset, VGMSTREAM * vgmstream) {
     int i;
 
 	vgmstream->current_block_offset = block_offset;
diff --git a/src/layout/str_snds_blocked.c b/src/layout/blocked_str_snds.c
similarity index 96%
rename from src/layout/str_snds_blocked.c
rename to src/layout/blocked_str_snds.c
index 91b64d60..7a7fca9a 100644
--- a/src/layout/str_snds_blocked.c
+++ b/src/layout/blocked_str_snds.c
@@ -2,7 +2,7 @@
 #include "../vgmstream.h"
 
 /* set up for the block at the given offset */
-void str_snds_block_update(off_t block_offset, VGMSTREAM * vgmstream) {
+void block_update_str_snds(off_t block_offset, VGMSTREAM * vgmstream) {
     off_t current_chunk;
     size_t file_size;
     int i;
diff --git a/src/layout/thp_blocked.c b/src/layout/blocked_thp.c
similarity index 94%
rename from src/layout/thp_blocked.c
rename to src/layout/blocked_thp.c
index 828d6c8d..abea3e2c 100644
--- a/src/layout/thp_blocked.c
+++ b/src/layout/blocked_thp.c
@@ -2,7 +2,7 @@
 #include "../vgmstream.h"
 
 /* set up for the block at the given offset */
-void thp_block_update(off_t block_offset, VGMSTREAM * vgmstream) {
+void block_update_thp(off_t block_offset, VGMSTREAM * vgmstream) {
     int i,j;
 	STREAMFILE *streamFile=vgmstream->ch[0].streamfile;
 	off_t	start_offset;
diff --git a/src/layout/tra_blocked.c b/src/layout/blocked_tra.c
similarity index 89%
rename from src/layout/tra_blocked.c
rename to src/layout/blocked_tra.c
index cc235f72..db29fe8e 100644
--- a/src/layout/tra_blocked.c
+++ b/src/layout/blocked_tra.c
@@ -2,7 +2,7 @@
 #include "../vgmstream.h"
 
 /* set up for the block at the given offset (first 32bytes is useless for decoding) */
-void tra_block_update(off_t block_offset, VGMSTREAM * vgmstream) {
+void block_update_tra(off_t block_offset, VGMSTREAM * vgmstream) {
     int i;
 
 	vgmstream->current_block_offset = block_offset;
diff --git a/src/layout/vs_blocked.c b/src/layout/blocked_vs.c
similarity index 89%
rename from src/layout/vs_blocked.c
rename to src/layout/blocked_vs.c
index 76e4cb27..4284642d 100644
--- a/src/layout/vs_blocked.c
+++ b/src/layout/blocked_vs.c
@@ -2,7 +2,7 @@
 #include "../vgmstream.h"
 
 /* set up for the block at the given offset */
-void vs_block_update(off_t block_offset, VGMSTREAM * vgmstream) {
+void block_update_vs(off_t block_offset, VGMSTREAM * vgmstream) {
     int i;
 
     for (i=0;i<vgmstream->channels;i++) {
diff --git a/src/layout/ws_aud_blocked.c b/src/layout/blocked_ws_aud.c
similarity index 92%
rename from src/layout/ws_aud_blocked.c
rename to src/layout/blocked_ws_aud.c
index dfc824a5..6912060e 100644
--- a/src/layout/ws_aud_blocked.c
+++ b/src/layout/blocked_ws_aud.c
@@ -2,7 +2,7 @@
 #include "../vgmstream.h"
 
 /* set up for the block at the given offset */
-void ws_aud_block_update(off_t block_offset, VGMSTREAM * vgmstream) {
+void block_update_ws_aud(off_t block_offset, VGMSTREAM * vgmstream) {
     int i;
     vgmstream->current_block_offset = block_offset;
     vgmstream->current_block_size = read_16bitLE(
diff --git a/src/layout/xa_blocked.c b/src/layout/blocked_xa.c
similarity index 97%
rename from src/layout/xa_blocked.c
rename to src/layout/blocked_xa.c
index bd208fd2..e7829b68 100644
--- a/src/layout/xa_blocked.c
+++ b/src/layout/blocked_xa.c
@@ -3,7 +3,7 @@
 #include "../vgmstream.h"
 
 /* set up for the block at the given offset */
-void xa_block_update(off_t block_offset, VGMSTREAM * vgmstream) {
+void block_update_xa(off_t block_offset, VGMSTREAM * vgmstream) {
     int i;
     int8_t currentChannel=0;
     int8_t subAudio=0;
diff --git a/src/layout/xvas_block.c b/src/layout/blocked_xvas.c
similarity index 91%
rename from src/layout/xvas_block.c
rename to src/layout/blocked_xvas.c
index ee78c3ad..a26ed0da 100644
--- a/src/layout/xvas_block.c
+++ b/src/layout/blocked_xvas.c
@@ -2,7 +2,7 @@
 #include "../vgmstream.h"
 
 /* set up for the block at the given offset */
-void xvas_block_update(off_t block_offset, VGMSTREAM * vgmstream) {
+void block_update_xvas(off_t block_offset, VGMSTREAM * vgmstream) {
     int i;
 
     vgmstream->current_block_offset = block_offset;
diff --git a/src/layout/layout.h b/src/layout/layout.h
index a9cfaebc..743a3439 100644
--- a/src/layout/layout.h
+++ b/src/layout/layout.h
@@ -7,53 +7,32 @@
 /* blocked layouts */
 void render_vgmstream_blocked(sample * buffer, int32_t sample_count, VGMSTREAM * vgmstream);
 
-void ast_block_update(off_t block_ofset, VGMSTREAM * vgmstream);
-
-void mxch_block_update(off_t block_ofset, VGMSTREAM * vgmstream);
-
-void halpst_block_update(off_t block_ofset, VGMSTREAM * vgmstream);
-
-void xa_block_update(off_t block_offset, VGMSTREAM * vgmstream);
-
+void block_update_ast(off_t block_ofset, VGMSTREAM * vgmstream);
+void block_update_mxch(off_t block_ofset, VGMSTREAM * vgmstream);
+void block_update_halpst(off_t block_ofset, VGMSTREAM * vgmstream);
+void block_update_xa(off_t block_offset, VGMSTREAM * vgmstream);
 void block_update_ea_schl(off_t block_offset, VGMSTREAM * vgmstream);
 void block_update_ea_1snh(off_t block_offset, VGMSTREAM * vgmstream);
 void block_update_caf(off_t block_offset, VGMSTREAM * vgmstream);
 void block_update_wsi(off_t block_offset, VGMSTREAM * vgmstream);
-
-void str_snds_block_update(off_t block_offset, VGMSTREAM * vgmstream);
-
-void ws_aud_block_update(off_t block_offset, VGMSTREAM * vgmstream);
-
-void matx_block_update(off_t block_offset, VGMSTREAM * vgmstream);
-
+void block_update_str_snds(off_t block_offset, VGMSTREAM * vgmstream);
+void block_update_ws_aud(off_t block_offset, VGMSTREAM * vgmstream);
+void block_update_matx(off_t block_offset, VGMSTREAM * vgmstream);
 void block_update_dec(off_t block_offset, VGMSTREAM * vgmstream);
-
-void vs_block_update(off_t block_offset, VGMSTREAM * vgmstream);
-
-void emff_ps2_block_update(off_t block_offset, VGMSTREAM * vgmstream);
-
-void emff_ngc_block_update(off_t block_offset, VGMSTREAM * vgmstream);
-
-void gsb_block_update(off_t block_offset, VGMSTREAM * vgmstream);
-
-void xvas_block_update(off_t block_offset, VGMSTREAM * vgmstream);
-
-void thp_block_update(off_t block_offset, VGMSTREAM * vgmstream);
-
-void filp_block_update(off_t block_offset, VGMSTREAM * vgmstream);
-
+void block_update_vs(off_t block_offset, VGMSTREAM * vgmstream);
+void block_update_emff_ps2(off_t block_offset, VGMSTREAM * vgmstream);
+void block_update_emff_ngc(off_t block_offset, VGMSTREAM * vgmstream);
+void block_update_gsb(off_t block_offset, VGMSTREAM * vgmstream);
+void block_update_xvas(off_t block_offset, VGMSTREAM * vgmstream);
+void block_update_thp(off_t block_offset, VGMSTREAM * vgmstream);
+void block_update_filp(off_t block_offset, VGMSTREAM * vgmstream);
 void block_update_ivaud(off_t block_offset, VGMSTREAM * vgmstream);
 void block_update_ea_swvr(off_t block_offset, VGMSTREAM * vgmstream);
 void block_update_adm(off_t block_offset, VGMSTREAM * vgmstream);
-
-void dsp_bdsp_block_update(off_t block_offset, VGMSTREAM * vgmstream);
-
-void tra_block_update(off_t block_offset, VGMSTREAM * vgmstream);
-
-void ps2_iab_block_update(off_t block_offset, VGMSTREAM * vgmstream);
-
-void ps2_strlr_block_update(off_t block_offset, VGMSTREAM * vgmstream);
-
+void block_update_bdsp(off_t block_offset, VGMSTREAM * vgmstream);
+void block_update_tra(off_t block_offset, VGMSTREAM * vgmstream);
+void block_update_ps2_iab(off_t block_offset, VGMSTREAM * vgmstream);
+void block_update_ps2_strlr(off_t block_offset, VGMSTREAM * vgmstream);
 void block_update_rws(off_t block_offset, VGMSTREAM * vgmstream);
 void block_update_hwas(off_t block_offset, VGMSTREAM * vgmstream);
 void block_update_ea_sns(off_t block_offset, VGMSTREAM * vgmstream);
diff --git a/src/libvgmstream.vcproj b/src/libvgmstream.vcproj
index 37f5f741..ce17fda0 100644
--- a/src/libvgmstream.vcproj
+++ b/src/libvgmstream.vcproj
@@ -1218,6 +1218,10 @@
                     RelativePath=".\meta\sqex_sead.c"
                     >
                 </File>
+                <File
+                    RelativePath=".\meta\sthd.c"
+                    >
+                </File>
                 <File
                     RelativePath=".\meta\stm.c"
                     >
@@ -1699,11 +1703,11 @@
 					>
 				</File>
 				<File
-					RelativePath=".\layout\ast_blocked.c"
+					RelativePath=".\layout\blocked_ast.c"
 					>
 				</File>
 				<File
-					RelativePath=".\layout\bdsp_blocked.c"
+					RelativePath=".\layout\blocked_bdsp.c"
 					>
 				</File>
 				<File
@@ -1755,23 +1759,23 @@
                     >
                 </File>
 				<File
-					RelativePath=".\layout\emff_blocked.c"
+					RelativePath=".\layout\blocked_emff.c"
 					>
 				</File>
 				<File
-					RelativePath=".\layout\filp_blocked.c"
+					RelativePath=".\layout\blocked_filp.c"
 					>
 				</File>
 				<File
-					RelativePath=".\layout\gsb_blocked.c"
+					RelativePath=".\layout\blocked_gsb.c"
 					>
 				</File>
 				<File
-					RelativePath=".\layout\halpst_blocked.c"
+					RelativePath=".\layout\blocked_halpst.c"
 					>
 				</File>
 				<File
-					RelativePath=".\layout\ims_block.c"
+					RelativePath=".\layout\blocked_matx.c"
 					>
 				</File>
 				<File
@@ -1783,7 +1787,7 @@
 					>
 				</File>
 				<File
-					RelativePath=".\layout\mxch_blocked.c"
+					RelativePath=".\layout\blocked_mxch.c"
 					>
 				</File>
 				<File
@@ -1795,11 +1799,11 @@
 					>
 				</File>
 				<File
-					RelativePath=".\layout\ps2_iab_blocked.c"
+					RelativePath=".\layout\blocked_ps2_iab.c"
 					>
 				</File>
 				<File
-					RelativePath=".\layout\ps2_strlr_blocked.c"
+					RelativePath=".\layout\blocked_ps2_strlr.c"
 					>
 				</File>
 				<File
@@ -1810,6 +1814,10 @@
                     RelativePath=".\layout\blocked_rws.c"
                     >
                 </File>
+                <File
+                    RelativePath=".\layout\blocked_sthd.c"
+                    >
+                </File>
                 <File
                     RelativePath=".\layout\blocked_hwas.c"
                     >
@@ -1819,23 +1827,23 @@
 					>
 				</File>
 				<File
-					RelativePath=".\layout\str_snds_blocked.c"
+					RelativePath=".\layout\blocked_str_snds.c"
 					>
 				</File>
 				<File
-					RelativePath=".\layout\thp_blocked.c"
+					RelativePath=".\layout\blocked_thp.c"
 					>
 				</File>
 				<File
-					RelativePath=".\layout\tra_blocked.c"
+					RelativePath=".\layout\blocked_tra.c"
 					>
 				</File>
 				<File
-					RelativePath=".\layout\vs_blocked.c"
+					RelativePath=".\layout\blocked_vs.c"
 					>
 				</File>
 				<File
-					RelativePath=".\layout\ws_aud_blocked.c"
+					RelativePath=".\layout\blocked_ws_aud.c"
 					>
 				</File>
 				<File
@@ -1843,11 +1851,11 @@
 					>
 				</File>
 				<File
-					RelativePath=".\layout\xa_blocked.c"
+					RelativePath=".\layout\blocked_xa.c"
 					>
 				</File>
 				<File
-					RelativePath=".\layout\xvas_block.c"
+					RelativePath=".\layout\blocked_xvas.c"
 					>
 				</File>
 			</Filter>
diff --git a/src/libvgmstream.vcxproj b/src/libvgmstream.vcxproj
index 3cd9622d..209d57ad 100644
--- a/src/libvgmstream.vcxproj
+++ b/src/libvgmstream.vcxproj
@@ -121,10 +121,10 @@
     <ClCompile Include="coding\mp4_aac_decoder.c" />
     <ClCompile Include="coding\mtaf_decoder.c" />
     <ClCompile Include="coding\mta2_decoder.c" />
-    <ClCompile Include="layout\ps2_iab_blocked.c" />
-    <ClCompile Include="layout\ps2_strlr_blocked.c" />
+    <ClCompile Include="layout\blocked_ps2_iab.c" />
+    <ClCompile Include="layout\blocked_ps2_strlr.c" />
     <ClCompile Include="layout\scd_int_layout.c" />
-    <ClCompile Include="layout\tra_blocked.c" />
+    <ClCompile Include="layout\blocked_tra.c" />
     <ClCompile Include="meta\akb.c" />
     <ClCompile Include="meta\awc.c" />
     <ClCompile Include="meta\bcstm.c" />
@@ -165,6 +165,7 @@
     <ClCompile Include="meta\seg.c" />
     <ClCompile Include="meta\sqex_scd.c" />
     <ClCompile Include="meta\sqex_sead.c" />
+    <ClCompile Include="meta\sthd.c" />
     <ClCompile Include="meta\tun.c" />
     <ClCompile Include="meta\txth.c" />
     <ClCompile Include="meta\wii_ras.c" />
@@ -473,8 +474,8 @@
     <ClCompile Include="coding\xa_decoder.c" />
     <ClCompile Include="layout\segmented.c" />
     <ClCompile Include="layout\aix_layout.c" />
-    <ClCompile Include="layout\ast_blocked.c" />
-    <ClCompile Include="layout\bdsp_blocked.c" />
+    <ClCompile Include="layout\blocked_ast.c" />
+    <ClCompile Include="layout\blocked_bdsp.c" />
     <ClCompile Include="layout\blocked.c" />
     <ClCompile Include="layout\blocked_awc.c" />
     <ClCompile Include="layout\blocked_ea_1snh.c" />
@@ -487,26 +488,27 @@
     <ClCompile Include="layout\blocked_ea_sns.c" />
     <ClCompile Include="layout\blocked_ea_wve_au00.c" />
     <ClCompile Include="layout\blocked_ea_wve_ad10.c" />
-    <ClCompile Include="layout\emff_blocked.c" />
-    <ClCompile Include="layout\filp_blocked.c" />
-    <ClCompile Include="layout\gsb_blocked.c" />
-    <ClCompile Include="layout\halpst_blocked.c" />
-    <ClCompile Include="layout\ims_block.c" />
+    <ClCompile Include="layout\blocked_emff.c" />
+    <ClCompile Include="layout\blocked_filp.c" />
+    <ClCompile Include="layout\blocked_gsb.c" />
+    <ClCompile Include="layout\blocked_halpst.c" />
+    <ClCompile Include="layout\blocked_matx.c" />
     <ClCompile Include="layout\interleave.c" />
     <ClCompile Include="layout\blocked_ivaud.c" />
-    <ClCompile Include="layout\mxch_blocked.c" />
+    <ClCompile Include="layout\blocked_mxch.c" />
     <ClCompile Include="layout\nolayout.c" />
     <ClCompile Include="layout\blocked_adm.c" />
     <ClCompile Include="layout\blocked_ea_swvr.c" />
     <ClCompile Include="layout\blocked_rws.c" />
+    <ClCompile Include="layout\blocked_sthd.c" />
     <ClCompile Include="layout\blocked_hwas.c" />
-    <ClCompile Include="layout\str_snds_blocked.c" />
-    <ClCompile Include="layout\thp_blocked.c" />
-    <ClCompile Include="layout\vs_blocked.c" />
-    <ClCompile Include="layout\ws_aud_blocked.c" />
+    <ClCompile Include="layout\blocked_str_snds.c" />
+    <ClCompile Include="layout\blocked_thp.c" />
+    <ClCompile Include="layout\blocked_vs.c" />
+    <ClCompile Include="layout\blocked_ws_aud.c" />
     <ClCompile Include="layout\blocked_wsi.c" />
-    <ClCompile Include="layout\xa_blocked.c" />
-    <ClCompile Include="layout\xvas_block.c" />
+    <ClCompile Include="layout\blocked_xa.c" />
+    <ClCompile Include="layout\blocked_xvas.c" />
     <ClCompile Include="..\ext_libs\clHCA.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/libvgmstream.vcxproj.filters b/src/libvgmstream.vcxproj.filters
index 4fc4bab2..01314f83 100644
--- a/src/libvgmstream.vcxproj.filters
+++ b/src/libvgmstream.vcxproj.filters
@@ -994,10 +994,10 @@
     <ClCompile Include="layout\aix_layout.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="layout\ast_blocked.c">
+    <ClCompile Include="layout\blocked_ast.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="layout\bdsp_blocked.c">
+    <ClCompile Include="layout\blocked_bdsp.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="layout\blocked.c">
@@ -1036,22 +1036,22 @@
     <ClCompile Include="layout\blocked_ea_sns.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="layout\emff_blocked.c">
+    <ClCompile Include="layout\blocked_emff.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="layout\filp_blocked.c">
+    <ClCompile Include="layout\blocked_filp.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="layout\gsb_blocked.c">
+    <ClCompile Include="layout\blocked_gsb.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="layout\halpst_blocked.c">
+    <ClCompile Include="layout\blocked_halpst.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="layout\blocked_hwas.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="layout\ims_block.c">
+    <ClCompile Include="layout\blocked_matx.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="layout\interleave.c">
@@ -1060,7 +1060,7 @@
     <ClCompile Include="layout\blocked_ivaud.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="layout\mxch_blocked.c">
+    <ClCompile Include="layout\blocked_mxch.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="layout\nolayout.c">
@@ -1075,25 +1075,28 @@
     <ClCompile Include="layout\blocked_rws.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="layout\str_snds_blocked.c">
+    <ClCompile Include="layout\blocked_sthd.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="layout\thp_blocked.c">
+    <ClCompile Include="layout\blocked_str_snds.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="layout\vs_blocked.c">
+    <ClCompile Include="layout\blocked_thp.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="layout\ws_aud_blocked.c">
+    <ClCompile Include="layout\blocked_vs.c">
+      <Filter>layout\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="layout\blocked_ws_aud.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="layout\blocked_wsi.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="layout\xa_blocked.c">
+    <ClCompile Include="layout\blocked_xa.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="layout\xvas_block.c">
+    <ClCompile Include="layout\blocked_xvas.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="meta\nub_vag.c">
@@ -1129,13 +1132,13 @@
     <ClCompile Include="meta\ps2_iab.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="layout\ps2_strlr_blocked.c">
+    <ClCompile Include="layout\blocked_ps2_strlr.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="layout\ps2_iab_blocked.c">
+    <ClCompile Include="layout\blocked_ps2_iab.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="layout\tra_blocked.c">
+    <ClCompile Include="layout\blocked_tra.c">
       <Filter>layout\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="coding\lsf_decoder.c">
@@ -1156,6 +1159,9 @@
     <ClCompile Include="meta\sqex_sead.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="meta\sthd.c">
+      <Filter>meta\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="meta\seg.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
diff --git a/src/meta/ast.c b/src/meta/ast.c
index fde88172..4ed5162c 100644
--- a/src/meta/ast.c
+++ b/src/meta/ast.c
@@ -59,7 +59,7 @@ VGMSTREAM * init_vgmstream_ast(STREAMFILE *streamFile) {
     vgmstream->loop_end_sample = read_32bitBE(0x1c,streamFile);
 
     vgmstream->coding_type = coding_type;
-    vgmstream->layout_type = layout_ast_blocked;
+    vgmstream->layout_type = layout_blocked_ast;
     vgmstream->meta_type = meta_AST;
 
     /* open the file for reading by each channel */
@@ -80,7 +80,7 @@ VGMSTREAM * init_vgmstream_ast(STREAMFILE *streamFile) {
     }
 
     /* start me up */
-    ast_block_update(0x40,vgmstream);
+    block_update_ast(0x40,vgmstream);
 
     return vgmstream;
 
diff --git a/src/meta/dsp_bdsp.c b/src/meta/dsp_bdsp.c
index d71b7141..cd39bf62 100644
--- a/src/meta/dsp_bdsp.c
+++ b/src/meta/dsp_bdsp.c
@@ -35,7 +35,7 @@ VGMSTREAM * init_vgmstream_dsp_bdsp(STREAMFILE *streamFile) {
 #endif
 
 
-        vgmstream->layout_type = layout_dsp_bdsp_blocked;
+        vgmstream->layout_type = layout_blocked_bdsp;
         vgmstream->interleave_block_size = 0x8;
         vgmstream->meta_type = meta_DSP_BDSP;
     
@@ -64,17 +64,17 @@ VGMSTREAM * init_vgmstream_dsp_bdsp(STREAMFILE *streamFile) {
 
     /* Calc num_samples */
     start_offset = 0x0;
-    dsp_bdsp_block_update(start_offset,vgmstream);
+    block_update_bdsp(start_offset,vgmstream);
     vgmstream->num_samples=0;
 
     do
     {
       vgmstream->num_samples += vgmstream->current_block_size*14/8;
-      dsp_bdsp_block_update(vgmstream->next_block_offset,vgmstream);
+      block_update_bdsp(vgmstream->next_block_offset,vgmstream);
     }
     while (vgmstream->next_block_offset<get_streamfile_size(streamFile));
 
-    dsp_bdsp_block_update(start_offset,vgmstream);
+    block_update_bdsp(start_offset,vgmstream);
 
 
     return vgmstream;
diff --git a/src/meta/emff.c b/src/meta/emff.c
index 10cb7645..79928e66 100644
--- a/src/meta/emff.c
+++ b/src/meta/emff.c
@@ -44,7 +44,7 @@ VGMSTREAM * init_vgmstream_emff_ps2(STREAMFILE *streamFile) {
     vgmstream->channels = channel_count;
     vgmstream->coding_type = coding_PSX;
 
-    vgmstream->layout_type = layout_emff_ps2_blocked;
+    vgmstream->layout_type = layout_blocked_emff_ps2;
     vgmstream->interleave_block_size = 0x10;
     vgmstream->meta_type = meta_EMFF_PS2;
 
@@ -59,7 +59,7 @@ VGMSTREAM * init_vgmstream_emff_ps2(STREAMFILE *streamFile) {
     }
 
     /* Calc num_samples */
-    emff_ps2_block_update(start_offset,vgmstream);
+    block_update_emff_ps2(start_offset,vgmstream);
     vgmstream->num_samples = read_32bitLE(0x8,streamFile);
     if (loop_flag) {
         vgmstream->loop_start_sample = (read_32bitLE(0x28,streamFile)-start_offset)*28/16/channel_count;
@@ -148,7 +148,7 @@ VGMSTREAM * init_vgmstream_emff_ngc(STREAMFILE *streamFile) {
         goto fail;
     }
 
-    vgmstream->layout_type = layout_emff_ngc_blocked;
+    vgmstream->layout_type = layout_blocked_emff_ngc;
     vgmstream->interleave_block_size = 0x10;
     vgmstream->meta_type = meta_EMFF_NGC;
 
@@ -163,7 +163,7 @@ VGMSTREAM * init_vgmstream_emff_ngc(STREAMFILE *streamFile) {
     }
 
     /* Calc num_samples */
-    emff_ngc_block_update(start_offset,vgmstream);
+    block_update_emff_ngc(start_offset,vgmstream);
     vgmstream->num_samples = read_32bitBE(0x8,streamFile);;
     if (loop_flag) {
         vgmstream->loop_start_sample = (read_32bitBE(0x28,streamFile))*14/8/channel_count;
diff --git a/src/meta/gsp_gsb.c b/src/meta/gsp_gsb.c
index 4e1c3021..b3cc95f7 100644
--- a/src/meta/gsp_gsb.c
+++ b/src/meta/gsp_gsb.c
@@ -63,7 +63,7 @@ VGMSTREAM * init_vgmstream_gsp_gsb(STREAMFILE *streamFile) {
             size_t num_blocks;
 
             vgmstream->coding_type = coding_NGC_DSP;
-            vgmstream->layout_type = layout_gsb_blocked;
+            vgmstream->layout_type = layout_blocked_gsb;
 
             if (!find_chunk_be(streamFileGSP, 0x47434558,first_offset,1, &chunk_offset,NULL)) goto fail; /*"GCEX"*/
 
diff --git a/src/meta/halpst.c b/src/meta/halpst.c
index caec16ad..24e6e23c 100644
--- a/src/meta/halpst.c
+++ b/src/meta/halpst.c
@@ -91,7 +91,7 @@ VGMSTREAM * init_vgmstream_halpst(STREAMFILE *streamFile) {
     }
 
     vgmstream->coding_type = coding_NGC_DSP;
-    vgmstream->layout_type = layout_halpst_blocked;
+    vgmstream->layout_type = layout_blocked_halpst;
     vgmstream->meta_type = meta_HALPST;
 
     /* load decode coefs */
@@ -120,7 +120,7 @@ VGMSTREAM * init_vgmstream_halpst(STREAMFILE *streamFile) {
     }
 
     /* start me up */
-    halpst_block_update(header_length,vgmstream);
+    block_update_halpst(header_length,vgmstream);
 
     return vgmstream;
 
diff --git a/src/meta/pc_mxst.c b/src/meta/pc_mxst.c
index 2e79f0f1..c33cfc26 100644
--- a/src/meta/pc_mxst.c
+++ b/src/meta/pc_mxst.c
@@ -179,7 +179,7 @@ VGMSTREAM * init_vgmstream_pc_mxst(STREAMFILE *streamFile) {
 	/* fill in the vital statistics */
 	vgmstream->channels = channel_count;
     vgmstream->sample_rate = sample_rate;
-    vgmstream->layout_type = layout_mxch_blocked;
+    vgmstream->layout_type = layout_blocked_mxch;
 	
     vgmstream->meta_type = meta_PC_MXST;
 	if(bits_per_sample == 8)
@@ -207,7 +207,7 @@ VGMSTREAM * init_vgmstream_pc_mxst(STREAMFILE *streamFile) {
         }
 
     }
-    mxch_block_update(start_offset, vgmstream);
+    block_update_mxch(start_offset, vgmstream);
 
     return vgmstream;
 
diff --git a/src/meta/ps2_filp.c b/src/meta/ps2_filp.c
index ec5d6757..967cf2cc 100644
--- a/src/meta/ps2_filp.c
+++ b/src/meta/ps2_filp.c
@@ -37,7 +37,7 @@ VGMSTREAM * init_vgmstream_filp(STREAMFILE *streamFile) {
     vgmstream->channels = channel_count;
     vgmstream->sample_rate = read_32bitLE(0x110,streamFile);
     vgmstream->coding_type = coding_PSX;
-    vgmstream->layout_type = layout_filp_blocked;
+    vgmstream->layout_type = layout_blocked_filp;
     vgmstream->meta_type = meta_FILP;
 
     /* open the file for reading */
@@ -50,7 +50,7 @@ VGMSTREAM * init_vgmstream_filp(STREAMFILE *streamFile) {
         }
     }
 
-    filp_block_update(start_offset,vgmstream);
+    block_update_filp(start_offset,vgmstream);
     vgmstream->num_samples = read_32bitLE(0x10C,streamFile)/16*28;
     if (loop_flag) {
         vgmstream->loop_start_sample = 0;
diff --git a/src/meta/ps2_iab.c b/src/meta/ps2_iab.c
index 0d9fdb78..0d010ae5 100644
--- a/src/meta/ps2_iab.c
+++ b/src/meta/ps2_iab.c
@@ -36,7 +36,7 @@ VGMSTREAM * init_vgmstream_ps2_iab(STREAMFILE *streamFile) {
     vgmstream->sample_rate = read_32bitLE(0x4,streamFile);
     vgmstream->coding_type = coding_PSX;
 
-    vgmstream->layout_type = layout_ps2_iab_blocked;
+    vgmstream->layout_type = layout_blocked_ps2_iab;
     vgmstream->interleave_block_size = read_32bitLE(0xC, streamFile);
     vgmstream->meta_type = meta_PS2_IAB;
     
@@ -50,16 +50,16 @@ VGMSTREAM * init_vgmstream_ps2_iab(STREAMFILE *streamFile) {
     }
 
     /* Calc num_samples */
-    ps2_iab_block_update(start_offset, vgmstream);
+    block_update_ps2_iab(start_offset, vgmstream);
     vgmstream->num_samples=0;
 
     do 
 	{    
 		vgmstream->num_samples += 0x4000 * 14 / 16;
-        ps2_iab_block_update(vgmstream->next_block_offset, vgmstream);
+        block_update_ps2_iab(vgmstream->next_block_offset, vgmstream);
     } while (vgmstream->next_block_offset < get_streamfile_size(streamFile));
 
-    ps2_iab_block_update(start_offset, vgmstream);
+    block_update_ps2_iab(start_offset, vgmstream);
 
     return vgmstream;
 
diff --git a/src/meta/ps2_strlr.c b/src/meta/ps2_strlr.c
index 0ef63ea5..2003f379 100644
--- a/src/meta/ps2_strlr.c
+++ b/src/meta/ps2_strlr.c
@@ -46,7 +46,7 @@ VGMSTREAM * init_vgmstream_ps2_strlr(STREAMFILE *streamFile) {
     vgmstream->sample_rate = 48000;
     vgmstream->coding_type = coding_PSX;
 
-    vgmstream->layout_type = layout_ps2_strlr_blocked;
+    vgmstream->layout_type = layout_blocked_ps2_strlr;
     //vgmstream->interleave_block_size = read_32bitLE(0xC, streamFile);
     vgmstream->meta_type = meta_PS2_STRLR;
     
@@ -60,16 +60,16 @@ VGMSTREAM * init_vgmstream_ps2_strlr(STREAMFILE *streamFile) {
     }
 
     /* Calc num_samples */
-    ps2_strlr_block_update(start_offset, vgmstream);
+    block_update_ps2_strlr(start_offset, vgmstream);
     vgmstream->num_samples=0;
 
     do
 	{
 		vgmstream->num_samples += vgmstream->current_block_size * 14 / 16;
-        ps2_strlr_block_update(vgmstream->next_block_offset, vgmstream);
+        block_update_ps2_strlr(vgmstream->next_block_offset, vgmstream);
     } while (vgmstream->next_block_offset < get_streamfile_size(streamFile));
 
-    ps2_strlr_block_update(start_offset, vgmstream);
+    block_update_ps2_strlr(start_offset, vgmstream);
 
     return vgmstream;
 
diff --git a/src/meta/psx_cdxa.c b/src/meta/psx_cdxa.c
index 1dd04d61..efdb52f6 100644
--- a/src/meta/psx_cdxa.c
+++ b/src/meta/psx_cdxa.c
@@ -105,7 +105,7 @@ VGMSTREAM * init_vgmstream_cdxa(STREAMFILE *streamFile) {
     vgmstream->xa_channel = xa_channel;
 
     vgmstream->coding_type = coding_XA;
-    vgmstream->layout_type = layout_xa_blocked;
+    vgmstream->layout_type = layout_blocked_xa;
     vgmstream->meta_type = meta_PSX_XA;
 
     if (is_blocked)
@@ -115,7 +115,7 @@ VGMSTREAM * init_vgmstream_cdxa(STREAMFILE *streamFile) {
     if ( !vgmstream_open_stream(vgmstream, streamFile, start_offset) )
         goto fail;
 
-    xa_block_update(start_offset,vgmstream);
+    block_update_xa(start_offset,vgmstream);
 
     return vgmstream;
 
diff --git a/src/meta/str_snds.c b/src/meta/str_snds.c
index b731f27c..6a43997a 100644
--- a/src/meta/str_snds.c
+++ b/src/meta/str_snds.c
@@ -122,7 +122,7 @@ VGMSTREAM * init_vgmstream_str_snds(STREAMFILE *streamFile) {
         default:
             goto fail;
     }
-    vgmstream->layout_type = layout_str_snds_blocked;
+    vgmstream->layout_type = layout_blocked_str_snds;
     vgmstream->meta_type = meta_STR_SNDS;
 
     /* channels and loop flag are set by allocate_vgmstream */
@@ -144,7 +144,7 @@ VGMSTREAM * init_vgmstream_str_snds(STREAMFILE *streamFile) {
     }
 
     /* start me up */
-    str_snds_block_update(0,vgmstream);
+    block_update_str_snds(0,vgmstream);
 
     return vgmstream;
 
diff --git a/src/meta/thp.c b/src/meta/thp.c
index 2a9c95b9..1244ff58 100644
--- a/src/meta/thp.c
+++ b/src/meta/thp.c
@@ -88,10 +88,10 @@ VGMSTREAM * init_vgmstream_thp(STREAMFILE *streamFile) {
     }
 
     vgmstream->full_block_size = read_32bitBE(0x18,streamFile); /* block size of current block, changes every time */
-    thp_block_update(start_offset,vgmstream);
+    block_update_thp(start_offset,vgmstream);
 
     vgmstream->coding_type = coding_NGC_DSP;
-    vgmstream->layout_type = layout_thp_blocked;
+    vgmstream->layout_type = layout_blocked_thp;
     vgmstream->meta_type = meta_THP;
 
     return vgmstream;
diff --git a/src/meta/vs.c b/src/meta/vs.c
index 9fe5ec34..0e7aa209 100644
--- a/src/meta/vs.c
+++ b/src/meta/vs.c
@@ -42,7 +42,7 @@ VGMSTREAM * init_vgmstream_vs(STREAMFILE *streamFile) {
     }
 #endif
 
-	vgmstream->layout_type = layout_vs_blocked;
+	vgmstream->layout_type = layout_blocked_vs;
 	vgmstream->meta_type = meta_VS;
 
     
@@ -55,15 +55,15 @@ VGMSTREAM * init_vgmstream_vs(STREAMFILE *streamFile) {
     }
 	
 	/* Calc num_samples */
-	vs_block_update(start_offset,vgmstream);
+	block_update_vs(start_offset,vgmstream);
 	vgmstream->num_samples=0;
 
 	do {
 		vgmstream->num_samples += vgmstream->current_block_size*28/16;
-		vs_block_update(vgmstream->next_block_offset,vgmstream);
+		block_update_vs(vgmstream->next_block_offset,vgmstream);
 	} while (vgmstream->next_block_offset<get_streamfile_size(streamFile));
 
-	vs_block_update(start_offset,vgmstream);
+	block_update_vs(start_offset,vgmstream);
     	
 
     return vgmstream;
diff --git a/src/meta/ws_aud.c b/src/meta/ws_aud.c
index cd13606c..41ae998a 100644
--- a/src/meta/ws_aud.c
+++ b/src/meta/ws_aud.c
@@ -100,7 +100,7 @@ VGMSTREAM * init_vgmstream_ws_aud(STREAMFILE *streamFile) {
         vgmstream->meta_type = meta_WS_AUD_old;
     }
 
-    vgmstream->layout_type = layout_ws_aud_blocked;
+    vgmstream->layout_type = layout_blocked_ws_aud;
 
     /* open the file for reading by each channel */
     {
@@ -118,9 +118,9 @@ VGMSTREAM * init_vgmstream_ws_aud(STREAMFILE *streamFile) {
 
     /* start me up */
     if (new_type) {
-        ws_aud_block_update(0xc,vgmstream);
+        block_update_ws_aud(0xc,vgmstream);
     } else {
-        ws_aud_block_update(0x8,vgmstream);
+        block_update_ws_aud(0x8,vgmstream);
     }
 
     return vgmstream;
diff --git a/src/meta/x360_tra.c b/src/meta/x360_tra.c
index b9418911..8554076c 100644
--- a/src/meta/x360_tra.c
+++ b/src/meta/x360_tra.c
@@ -38,7 +38,7 @@ VGMSTREAM * init_vgmstream_x360_tra(STREAMFILE *streamFile) {
 
 	vgmstream->coding_type = coding_DVI_IMA_int;
     vgmstream->num_samples = (int32_t)(get_streamfile_size(streamFile) - ((get_streamfile_size(streamFile)/0x204)*4));
-    vgmstream->layout_type = layout_tra_blocked;
+    vgmstream->layout_type = layout_blocked_tra;
 	
     vgmstream->meta_type = meta_X360_TRA;
 
@@ -51,7 +51,7 @@ VGMSTREAM * init_vgmstream_x360_tra(STREAMFILE *streamFile) {
         }
     }
 
-	tra_block_update(0,vgmstream);
+	block_update_tra(0,vgmstream);
     return vgmstream;
 
     /* clean up anything we may have opened */
diff --git a/src/meta/xbox_ims.c b/src/meta/xbox_ims.c
index 89aeef60..220eeac1 100644
--- a/src/meta/xbox_ims.c
+++ b/src/meta/xbox_ims.c
@@ -31,7 +31,7 @@ VGMSTREAM * init_vgmstream_xbox_matx(STREAMFILE *streamFile) {
     vgmstream->sample_rate = read_16bitLE(0x06,streamFile) & 0xffff;
 
 	vgmstream->coding_type = coding_XBOX_IMA;
-    vgmstream->layout_type = layout_matx_blocked;
+    vgmstream->layout_type = layout_blocked_matx;
     vgmstream->meta_type = meta_XBOX_MATX;
 
     /* open the file for reading by each channel */
@@ -43,15 +43,15 @@ VGMSTREAM * init_vgmstream_xbox_matx(STREAMFILE *streamFile) {
     }
 
 	/* Calc num_samples */
-	matx_block_update(0,vgmstream);
+	block_update_matx(0,vgmstream);
 	vgmstream->num_samples=0;
 
 	do {
 		vgmstream->num_samples += vgmstream->current_block_size/36*64;
-		matx_block_update(vgmstream->next_block_offset,vgmstream);
+		block_update_matx(vgmstream->next_block_offset,vgmstream);
 	} while (vgmstream->next_block_offset<get_streamfile_size(streamFile));
 
-	matx_block_update(0,vgmstream);
+	block_update_matx(0,vgmstream);
     return vgmstream;
 
     /* clean up anything we may have opened */
diff --git a/src/meta/xbox_xvas.c b/src/meta/xbox_xvas.c
index 21ea9be4..6ee37b86 100644
--- a/src/meta/xbox_xvas.c
+++ b/src/meta/xbox_xvas.c
@@ -37,13 +37,13 @@ VGMSTREAM * init_vgmstream_xbox_xvas(STREAMFILE *streamFile) {
     }
 
     vgmstream->coding_type = coding_XBOX_IMA;
-    vgmstream->layout_type = layout_xvas_blocked;
+    vgmstream->layout_type = layout_blocked_xvas;
     vgmstream->meta_type = meta_XBOX_XVAS;
 
     if (!vgmstream_open_stream(vgmstream, streamFile, start_offset))
         goto fail;
 
-    xvas_block_update(start_offset,vgmstream);
+    block_update_xvas(start_offset,vgmstream);
     return vgmstream;
 
 fail:
diff --git a/src/vgmstream.c b/src/vgmstream.c
index a63e404e..d0639200 100644
--- a/src/vgmstream.c
+++ b/src/vgmstream.c
@@ -896,32 +896,32 @@ void render_vgmstream(sample * buffer, int32_t sample_count, VGMSTREAM * vgmstre
         case layout_none:
             render_vgmstream_nolayout(buffer,sample_count,vgmstream);
             break;
-        case layout_mxch_blocked:
-        case layout_ast_blocked:
-        case layout_halpst_blocked:
-        case layout_xa_blocked:
+        case layout_blocked_mxch:
+        case layout_blocked_ast:
+        case layout_blocked_halpst:
+        case layout_blocked_xa:
         case layout_blocked_ea_schl:
         case layout_blocked_ea_1snh:
         case layout_blocked_caf:
         case layout_blocked_wsi:
-        case layout_str_snds_blocked:
-        case layout_ws_aud_blocked:
-        case layout_matx_blocked:
+        case layout_blocked_str_snds:
+        case layout_blocked_ws_aud:
+        case layout_blocked_matx:
         case layout_blocked_dec:
-        case layout_vs_blocked:
-        case layout_emff_ps2_blocked:
-        case layout_emff_ngc_blocked:
-        case layout_gsb_blocked:
-        case layout_xvas_blocked:
-        case layout_thp_blocked:
-        case layout_filp_blocked:
+        case layout_blocked_vs:
+        case layout_blocked_emff_ps2:
+        case layout_blocked_emff_ngc:
+        case layout_blocked_gsb:
+        case layout_blocked_xvas:
+        case layout_blocked_thp:
+        case layout_blocked_filp:
         case layout_blocked_ivaud:
         case layout_blocked_ea_swvr:
         case layout_blocked_adm:
-        case layout_dsp_bdsp_blocked:
-        case layout_tra_blocked:
-        case layout_ps2_iab_blocked:
-        case layout_ps2_strlr_blocked:
+        case layout_blocked_bdsp:
+        case layout_blocked_tra:
+        case layout_blocked_ps2_iab:
+        case layout_blocked_ps2_strlr:
         case layout_blocked_rws:
         case layout_blocked_hwas:
         case layout_blocked_ea_sns:
diff --git a/src/vgmstream.h b/src/vgmstream.h
index 56b6668f..f7342b1e 100644
--- a/src/vgmstream.h
+++ b/src/vgmstream.h
@@ -216,32 +216,32 @@ typedef enum {
     layout_interleave,      /* equal interleave throughout the stream */
 
     /* headered blocks */
-    layout_ast_blocked,
-    layout_halpst_blocked,
-    layout_xa_blocked,
+    layout_blocked_ast,
+    layout_blocked_halpst,
+    layout_blocked_xa,
     layout_blocked_ea_schl,
     layout_blocked_ea_1snh,
     layout_blocked_caf,
     layout_blocked_wsi,
-    layout_str_snds_blocked,
-    layout_ws_aud_blocked,
-    layout_matx_blocked,
+    layout_blocked_str_snds,
+    layout_blocked_ws_aud,
+    layout_blocked_matx,
     layout_blocked_dec,
-    layout_xvas_blocked,
-    layout_vs_blocked,
-    layout_emff_ps2_blocked,
-    layout_emff_ngc_blocked,
-    layout_gsb_blocked,
-    layout_thp_blocked,
-    layout_filp_blocked,
+    layout_blocked_xvas,
+    layout_blocked_vs,
+    layout_blocked_emff_ps2,
+    layout_blocked_emff_ngc,
+    layout_blocked_gsb,
+    layout_blocked_thp,
+    layout_blocked_filp,
     layout_blocked_ea_swvr,
     layout_blocked_adm,
-    layout_dsp_bdsp_blocked,
-    layout_mxch_blocked,
+    layout_blocked_bdsp,
+    layout_blocked_mxch,
     layout_blocked_ivaud,   /* GTA IV .ivaud blocks */
-    layout_tra_blocked,     /* DefJam Rapstar .tra blocks */
-    layout_ps2_iab_blocked,
-    layout_ps2_strlr_blocked,
+    layout_blocked_tra,     /* DefJam Rapstar .tra blocks */
+    layout_blocked_ps2_iab,
+    layout_blocked_ps2_strlr,
     layout_blocked_rws,
     layout_blocked_hwas,
     layout_blocked_ea_sns,  /* newest Electronic Arts blocks, found in SNS/SNU/SPS/etc formats */