Thanks for the patch. The simplification of the variant name is nice, however it recently came to my attention that props synchronize with their parents variant name. So if the parent has a 'D' variant only one of the elements of the second group will be picked when the parents is in that variant (Dunno if I make sense) Hence why its better to have a little more specific names for variants.
You can remove the standalone as well while at it :)
I’ve just restored the file with its previous content in https://code.wildfiregames.com/rP22830
Sorry about all this trouble, applying the patch was really unclean. I had trouble with both «svn patch» and «patch -uN» due to the spaces in file names, but even when I solved that the patch did not apply the file renamings as intended.