Fixes naming issues in runtime pickling