Fixes naming issues in runtime pickling
Merge pull request #226 from scala/runtime-pickling-fix

Fixes naming issues in runtime pickling