Various SpringPlugin fixes

I did quite like my naming scheme where the exact type name was captured after the underscore, but I suppose it doesn't really matter.