Fixes naming issues in runtime pickling

might be worth investigating whether or not there's a more general way to deal with these synthesized names...