option for old name mapping logic and some small bug fixes