Issue2356

fix + test for issue #2356. I've just replaced `type.Name` to `type.SerializationFriendlyName()` method that already exsists.
Funny, I didn't know we had such method!