Inconsistency with naming of models

[Beatso]

Some models are called something like brown_mushroom_block1.json while others are just 1.json. Make them all like the latter.