Rename/rework pre/post mapping functions
0.3.0