Extension of the since-resolved #2427. I should probably try to be a bit more in-depth...

You wanted the naming convention inverted... I inverted it... we're not doing it case by case. I'll remove some of the pluralization though but 'cobble marble slab' is staying