mapper: renamed mapping functions
mapper: fixed DateTime mapping