Use more encoded names in pickle/unpickle macros

Improve names of custom unpicklers and builders.